OAK-307 - minor pom refactorings
OAK-307 - minor pom refactorings