Merge r1580078 from branch-2. YARN-1849. Fixed NPE in ResourceTrackerService#registerNodeManager for UAM. Contributed by Karthik Kambatla

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