HBASE-10413 fixes after code review