Merge "Change executed test cases for bgpvpn scenarios"