HBASE-418 Move HMaster and related classes into master package Part 2 (Previous patch moved these classes but turns out new version also had changes in them -- adding these now).