b52f201285
(cherry picked from commit 7f35676f90f0730b8c9844cf00ee5a943f80d48d) Conflicts: hadoop-project/pom.xml