Merge "Update pom to conform merge jobs requirments"