Merge branch 'master' into feature/7847_lebail_nac
Fixed unit test.  Refs #7847.
Resloved conflict.  Refs #7847.