Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f650e351
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f650e351
Diff: http://git-wip-us.apache.org/repos/asf/am
Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eb568132
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb568132
Diff: http://git-wip-us.apache.org/repos/asf/am
Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f6bc7979
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6bc7979
Diff: http://git-wip-us.apache.org/repos/asf/am
Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/353a076c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/353a076c
Diff: http://git-wip-us.apache.org/repos/asf/am