refs #7445. Fix GCC Errors.
Merge branch 'feature/7445_reflectometry_q' into develop