Merge "bug 1128:POM Restructuring for Automated Release"