svn merge -c 1610829 FIXES: Addendum patch for HADOOP-10468 TestMetricsSystemImpl.testMultiThreadedPublish fails intermediately. Contributed by Akira AJISAKA


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