Merge branch 'master' into feature/7476_new_costfun_rwp
Removed 1 debug output.  Refs #7476.
Merge branch 'feature/7476_new_costfun_rwp' into develop