HBASE-1816 Master rewrite; part 1 -- bit of crud removal and tightening up of access in master package