Further EVPN changes for JUNOS interop.