Merge commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea' into jgfouca/…

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

* commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea':
  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 E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass

config_machines.xml

@@ -572,6 +572,7 @@
     <SUPPORTED_BY>cseg</SUPPORTED_BY>
     <MAX_TASKS_PER_NODE>256</MAX_TASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
+    <COSTPES_PER_NODE>68</COSTPES_PER_NODE>
     <mpirun mpilib="default">
       <executable>srun</executable>
       <arguments>
@@ -1843,6 +1844,7 @@
     <SUPPORTED_BY>cseg</SUPPORTED_BY>
     <MAX_TASKS_PER_NODE>30</MAX_TASKS_PER_NODE>
     <MAX_MPITASKS_PER_NODE>15</MAX_MPITASKS_PER_NODE>
+    <COSTPES_PER_NODE>16</COSTPES_PER_NODE>
     <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
     <mpirun mpilib="default" unit_testing="true">
       <!-- For unit testing, avoid all of the extra stuff that we use before and