HBASE-11921 Minor fixups that come of testing branch-1 (Stack)