Merge "BUG 2954 : Thread local DocumentBuilder's for XmlUtil"