Merge pull request #1812 from ESMCI/mfdeakin-sandia/configuration_cha…

…nges

Merge configuration changes from ACME to CIME
This just copies the latest configuration files from ACME to CIME to fix Skybridge configuration changes and meet the new xmllint requirements

Test suite: scripts_regression_tests
Test baseline:
Test namelist changes:
Test status: BFB

User interface changes?: N

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

Code review: @jedwards4b