Removed brute-force dependency on xml-apis that is not required in master