Remove changes prematurely committed -- fixes that were for hbck tool and that broek the HBaseAdmin tests