YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji Kikushima. svn merge --ignore-ancestry -c 1602071 ../../trunk/