Merge branch 'feature/7965_updateQLines_ws_format'
refs #8197. Update system tests.
Merge branch 'feature/8197_refl_package' into develop