Merge "Update expectations after push of apache-xml and other fixes."