Update version number to 2.5. Refs #7058
Merge branch 'feature/7058_update_version_2.5' into develop