Merge "Fix xml loading for managed services" into oc-mr1-dev