Merge r1490437 from trunk to branch-2 for YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)