7489f0fd1a
(cherry picked from commit f9ba4ef7d5e50be86ffca71b6c4bbc5575f64326) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java