merge changes to pom.xml from master branch