Merge commit '3915cfda8866df152183f2b49f7b095142c50523' into jgfouca/…

…branch-for-to-acme-11-13-2017-pr

* commit '3915cfda8866df152183f2b49f7b095142c50523':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in #1888"
  Revert the change to edison as this is now in #1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass

driver-mct/cime_config/config_component.xml

@@ -2063,6 +2063,14 @@
     <default_value>0</default_value>
     <group>mach_pes_last</group>
     <file>env_mach_pes.xml</file>
+    <desc>pes or cores per node for mpitasks </desc>
+  </entry>
+
+  <entry id="COSTPES_PER_NODE">
+    <type>integer</type>
+    <default_value>$MAX_MPITASKS_PER_NODE</default_value>
+    <group>mach_pes_last</group>
+    <file>env_mach_pes.xml</file>
     <desc>pes or cores per node for accounting purposes </desc>
   </entry>