refs #8124. Make changes post code review.
Merge branch 'feature/8124_reflectometry_config' into develop