Merge "Add apache-xml to boot class path for tests."