Merge "Revert "Make neutron-tempest-plugin-bgpvpn-bagpipe non-voting""