Merge "Verify XmlSupport against OpenJDK 8u121-b13."