HBASE-11742 Addendum makes compilation on hadoop-1 pass