New poms and updated manifests after merge from master