backport bgp xmpp connection fix from master

Change-Id: Ib0f3e9e866f150f21d683631ef52b3e127813246