Refs #3163: change pom version
Merging 2.4 to 2.5