## What changes were proposed in this pull request? Cherry pick of https://github.com/apache/ambari/pull/2228
[ Full content available at: https://github.com/apache/ambari/pull/2229 ] This message was relayed via gitbox.apache.org for [email protected]
