SWITCHYARD-2420 Performance regression in XML based validation