HBASE-481 Move HMaster and related classes into master package Part 4: I committed changes in below configs. unintentionally.