YARN-2699. Fixed a bug in CommonNodeLabelsManager that caused tests to fail when using ephemeral ports on NodeIDs. Contributed by Wangda Tan.

(cherry picked from commit abae63caf9c53b404f2f2db7d482555484eaeaf8)
YARN-2588. Standby RM fails to transitionToActive if previous transitionToActive failed with ZK exception. Contributed by Rohith Sharmaks
(cherry picked from commit a6aa6e42cacdbfcc1c2b7c19e7239204fe9ff654)
MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client. Contributed by Rohith
(cherry picked from commit 209b1699fcd150676d4cc47e8e817796086c1986)