DM EVPN configuration bug 1395944

Change-Id: I083786054f7b92d4ef0c3abdf3b066cae2f964d2
Merge "DM EVPN configuration bug 1395944"