Completing preferred Maven XSD fix
Merge branch '1_2_X'