YARN-2400. Fixed TestAMRestart fails intermittently. Contributed by Jian He


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