Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f70591b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f70591b1
Diff: http://git-wip-us.apache.org/repos/asf/ambar
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c5d2bd0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c5d2bd0
Diff: http://git-wip-us.apache.org/repos/asf/ambar