bgp xmpp connection retry backport from master

Change-Id: Ie434bd67536cb009879247666c86b23b61352811
Merge "bgp xmpp connection retry backport from master" into R1.05