HADOOP-10404.  Commit correct version of patch (cmccabe)
(cherry picked from commit 687d83c9e10a4432c8d54c2cd406c7ccb4392187)