Merge "Add BGPVPN horizon plugin support"