Merge "Samples/maven-code-gen-sample pom.xml updated after recent changes."