Merge branch 'master' into agsalin/update-to-cime5.3.1

Upstream merge to resolve conflicts.

* master: (93 commits)
  Adds the --force-move option and implies --copy-only when --last-date is specified without --force-move
  added spunup A_WCYCL options (1850S and 2000S) for v0atm
  Updates land initial conditions for ne120_oRRS18v3
  Fix jenkins_generic_job when user selects specific machines.
  Fix small problems with MPAS components from debug tests
  Adds a warning when using the --last-date option and to its help
  Implement the copy_only option for short term archiving. This copies files rather than moving them
  Implemented most of the machinery for testing with "incomplete" log files
  Fix code format issue - replace unused variable with _
  Update template.st_archive
  Adds options to the st_archive to specify the last date (--last-date) to archive, and whether to disable archiving incomplete log files (--no-incomplete-logs)
  Turn off salinity restoring by default until it passes exact restart
  This is a fix to a PR #1501 (github issue #1263). I allocated the tmp_array to be too large and GNU compiler stopped with an array mismatch. Change this to be state%ncol in size, not pcol
  Fix a floating invalid that we found with certain PE's (and with intel v17.02)
  bug fix
  Revert mpas-o commit with new threaded vector reconstruction consistency changes
  Changing jobmin to 1 for batch q on blues
  Modifies SMS_D_Ln5_P8x4 to SMS_Ln5 to avoid cetus and melvin issues
  Point at corrected salinity restoring files for oEC60to30v3 and oRRS18to6v3
  Make sure clean clm cleans up obj dir
  ...

config/acme/allactive/config_compsets.xml

@@ -120,6 +120,17 @@
  <lname>2000_CAM5_CLM45%SP_MPASCICE_MPASO_MOSART_SGLC_SWAVi</lname>
 </compset>
 
+<compset>
+ <alias>A_WCYCL1850S_v0atm</alias> 
+ <lname>1850_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+ <alias>A_WCYCL2000S_v0atm</alias>
+ <lname>2000_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAVi</lname>
+</compset>
+
+
 <!-- ACME BG compsets -->
 
 <compset>