Merge r1495686 from branch-2 to branch-2.1-beta. MiniYARNCluster broken after YARN-827 (bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1495689 13f79535-47bb-0310-9956-ffa450edef68