YARN-1863. Fixed test failure in TestRMFailover after YARN-1859. Contributed by Xuan Gong. svn merge --ignore-ancestry -c 1580094 ../../trunk/