HADOOP-1784 delete Previous commit against this issue applied v3 rather than v4. This commit applies the difference which should fix the currently broken build.