MDL-28126 webservice : resolved integration conflicts