d2ceef0f20
Contributed by Thomas Marquardt (Backported to branch-2 via /HADOOP-15156) (cherry picked from commit a35267b47abf62d2ab32bc6860d2080284323042)