Turn off auto conflict resolution by default for e3sm cime mgmt tools

It still isn't working right in a lot of cases.

Test suite: by-hand, code-checker
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: