refs #9257. Fix doxygen warnings.
Merge branch 'feature/9257_ccl_performance' into develop