master: Support shadow reconnection to master

Change-Id: Ibb086525088e07ceea41f977054104025d36ea16