first part of changes adapting to upgarde JAXP to 1.5

Change-Id: I7f1a1d5b0f3fa60333e92d9bef3cb2b3de615a4d