EVPN related changes, some cleanup
Merge branch 'ipv6-devel2' of github.com:Juniper/contrail-dev-vrouter into ipv6-devel2