YARN-1454. Fixed test failure issue with TestRMRestart. Contributed by Karthik Kambatla. svn merge --ignore-ancestry -c 1547651 ../../trunk/