## What changes were proposed in this pull request? Merging `trunk` into `branch-feature-AMBARI-14714`
## How was this patch tested? Ran a build... [ Full content available at: https://github.com/apache/ambari/pull/2215 ] This message was relayed via gitbox.apache.org for [email protected]
