HBASE-12467 Master joins cluster but never completes initialization

Signed-off-by: Andrew Purtell <apurtell@apache.org>

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java