## What changes were proposed in this pull request? Same as #2171 and #2179, for `branch-2.7`.
## How was this patch tested? Ran unit tests. [ Full content available at: https://github.com/apache/ambari/pull/2180 ] This message was relayed via gitbox.apache.org for [email protected]
