Merge "Minor pom updates"