## What changes were proposed in this pull request? Merge branch 'trunk' into branch-feature-AMBARI-14714
## How was this patch tested? Resolved unit test failures. [ Full content available at: https://github.com/apache/ambari/pull/2272 ] This message was relayed via gitbox.apache.org for [email protected]
