Merge "Re-adding version to parent pom"