Merge "Adapt bgpvpn scenarios to recent sRBAC changes"