Update version number to 2.5. Refs #7058
Merge remote-tracking branch 'origin/feature/7058_update_version_2.5'