Merge -c 1584954 from trunk to branch-2 to fix YARN-1898. Addendum patch to ensure /jmx and /metrics are re-directed to Active RM.
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestRMFailover.java