HBASE-10257 [0.94] Master aborts due to assignment race

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1554144 13f79535-47bb-0310-9956-ffa450edef68