HBASE-12479 Backport HBASE-11689 (Track meta in transition) (Virag Kothari)
HBASE-12479 Backport HBASE-11689 (Track meta in transition) (Virag Kothari); addendum

Test fix for TestAssignmentManagerOnCluster
Merge remote-tracking branch 'remotes/origin/0.98' into 0.98