Backported to branch-1.4.0 for Hadoop 2.0 work

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/branch-1.4.0@1487638 13f79535-47bb-0310-9956-ffa450edef68