6e37c5fe80
(cherry picked from commit 9ba1e5af06070ba01dcf46e1a4c66713a1d43352) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperHACheckpoints.java