HADOOP-10404.  Commit correct version of patch (cmccabe)