Support for draft-rosen-vpn-ospf-bgp-mpls and for additional BGP