Merge "pom.xml fixes for entire SDC"