Merge "Fix xml loading for managed services"