Merge "Fix a few POM versioning/dependency warnings"