Fix pom inconsistencies

Change-Id: Ibf5c33c5cc0c50f53eec3330456202953c39a7a3