Cherrypick 123243 which was commited on wrong branch (fix reconnecting to same server as party leader not prompting other users to connect)