Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 00e2405fbd598602fdccf31826948c198c053fa5) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisher.java