YARN-899. Added back queue level administrator-acls so that there is no regression w.r.t 1.x. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1527282 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1527284 13f79535-47bb-0310-9956-ffa450edef68
YARN-899. Fixing the missed merge-conflict issue when merging from trunk to branch-2.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1527285 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5538. Fixed test compilation issues on branch-2.1. (vinodkv)


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