Revert "Thrift interface changes to support BGP VPNv6"

No match.