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


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