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