Merge pull request #3392 from c-po/bgp-evpn-T6189
bgp: T6189: L3VPN connectivity is broken after re-enabling VRF