Fix inconsistencies in pom.xml

Change-Id: Ie7d3fa6bde3dc4139c6bceb2b99ba362c3559dcd