Revert "Revert "Merge branch-feature-AMBARI-14714-configs to branch-feature-AMBARI-14714""

This reverts commit 228236c4a71b151fe157afdfa0c5b3ccf0c6a602.
7 files changed