add master with other servers reconnect support

Change-Id: Ie445aa3fa0fc2c22eeb96680a3bb2fec5fab70fb