Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev