HBASE-12683 Compilation with hadoop-2.7.0-SNAPSHOT is broken - ADDENDUM