Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev
am: a01c1f0d
* commit 'a01c1f0d':
xxxTrustAgentConfiguration should be supported in the parent DPM instance
Change-Id: I75cb2133f8f54ccf938fb5d107a8dc8f2dcd6f9c