Merge "Cleanup and add bgpvpn to scenario file"
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Fri, 8 Apr 2016 09:58:14 +0000 (09:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 8 Apr 2016 09:58:14 +0000 (09:58 +0000)

Trivial merge