Fix inconsistencies in pom.xml

Change-Id: I25b34c2e61cf3bf3c2602c80295f1ec0564ee953