Merge remote-tracking branch 'origin/feature/7058_update_version_2.5'
refs #7060. Check for PV before bringing in plugins.
Merge branch 'bugfix/7060_ubuntu_pv' into develop