Sync svn externals

git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x@1520978 13f79535-47bb-0310-9956-ffa450edef68
Axe extra elemet breaking build and pretty format xml

git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x@1520981 13f79535-47bb-0310-9956-ffa450edef68
More xml cleanup.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x@1520986 13f79535-47bb-0310-9956-ffa450edef68