Merge r1588347 from branch2: YARN-1750. TestNodeStatusUpdater#testNMRegistration is incorrect in test case. (Wangda Tan via junping_du)

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