Revert "AMBARI-8174. Reverting all patches. (swagle)"

This reverts commit d256ab8f94e9dc1292c9ce69e76235b215ca8dc0.
Revert "AMBARI-8174. Reverting all patches. (swagle)"

This reverts commit 24c39273ff0487c71f5688c14bf2ef8df9786210.
Revert "AMBARI-8174. Reverting all patches. (swagle)"

This reverts commit a4b8c9b30f2756cb24ee372e5741d76db7b517a1.