Make bgp_peer_membership_test nore robust

Change-Id: If54e06d850341704c814ad52281375bac9c02857
Merge "Make bgp_peer_membership_test nore robust"