Cleaned the code.  Refs #7847.
Merge branch 'feature/7847_lebail_nac' into develop