Merge "Upgrade: add missing steps for bgpvpn/bagpipe"