Fix inconsistencies in pom.xml

Change-Id: I12ead46b3ef00d69bce3d881385f9ea6e6c55eef