upgrading parent pom to 16
Merge branch '1_1_X' into 1_2_X