bgp_xmpp_wready_test is flaky -- https://jenkins.opencontrail.org/job/ci-contrail-controller-unittest/630/console

Change-Id: I5ffdc4562d2708d340c90828c747975788cf0492
Merge "bgp_xmpp_wready_test is flaky -- https://jenkins.opencontrail.org/job/ci-contrail-controller-unittest/630/console"