Merge remote branch 'origin/feature/7015_update_dev_rpm'
Merge remote branch 'origin/feature/6966_qtassistant_eqns'
Merge remote branch 'origin/bugfix/6501_browse'
Merge remote-tracking branch 'origin/feature/7016_sans_sensitivity'
Move logic into separate file. refs #7021
Merge branch 'feature/7021_cmake_linux_distro' into develop