Merge pom version changes from Jenkins working branch