Merge branch 'jonbob/mpaso/fix-conservation-test' into next (PR #6659)

Fix the mpaso-conservation_check testdef

Add sed commands to modify env_archive.xml to correctly test the
conservation am. As is, the test runs and makes the
hist.am.conservationCheck files just fine, but does not run cprnc on
them and include its results in the TestStatus.

[BFB]

components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/conservation_check/shell_commands

@@ -0,0 +1,5 @@
+# include mpas-ocean outputs in testing
+sed -i 's/\(compname="mpaso" exclude_testing="true"\)/compname="mpaso"/' env_archive.xml
+sed -i '/\(compname="mpaso"\)/,/<hist_file_extension>/ s/<hist_file_extension>hist/<hist_file_extension>hist.am.conservationCheck\\..*\\.nc$/' env_archive.xml
+sed -i 's/casename.mpaso.hist.am.globalStats.1976-01-01.nc/casename.mpaso.hist.am.conservationCheck.1976-01-01.nc/' env_archive.xml
+sed -i '/casename.mpaso.hist.am.highFrequencyOutput.1976-01-01_00.00.00.nc/d' env_archive.xml