Merge "BUG 5057 bgpvpn-create fails with IOBE"