HBASE-10413 final code review