CONN-1072:  POM fixes