fixing duplicate handling in XML Execution Plan deployment
fixing Integration test