Mainline POM changes for Jenkins