Changes to build/run on cori-haswell.

Changes to add cori-haswell and cori-knl. Adds temporary hack for the -c flag to srun until we get changes from cime5.2. Removes a slurm batch option from the default. Similar change has been made onto ESMCI/cime master.

Test suite: passed cime_developers
Test baseline:
Test namelist changes:
Test status: BFB

Fixes

User interface changes?: no

Code review:

Stubs got cori-knl.