Merge "[bgpvpn] Remove unused scenario.manager methods"