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

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java

@@ -258,6 +258,8 @@ public class ResourceManager extends CompositeService implements Recoverable {
 
     this.applicationACLsManager = new ApplicationACLsManager(conf);
 
+    queueACLsManager = createQueueACLsManager(scheduler, conf);
+
     this.rmAppManager = createRMAppManager();
     // Register event handler for RMAppManagerEvents
     this.rmDispatcher.register(RMAppManagerEventType.class,