YARN-733. Fixed TestNMClient from failing occasionally. Contributed by Zhijie Shen. svn merge --ignore-ancestry -c 1488618 ../../trunk/