Fix bugs in bgp-stress-test

Change-Id: I8caf09552e2ac375c1649593c0d9914ac82a68be
Merge "Fix bugs in bgp-stress-test"