Merge "Add noha scenario for bgpvpn"