Merge r1578487 from branch-2. YARN-1830. Fixed TestRMRestart#testQueueMetricsOnRMRestart failure due to race condition when app is submitted. Contributed by Zhijie Shen

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