EVPN Merge conflicts resolutions

Change-Id: I8c91ed239bf82c0c100802a2a40882e4c37f1bcc