Fix IPv6 neighbor discovery if VLAN is present

Issue was reported in ESXi interop and has been verified in the same environment

Change-Id: I3fc69c591919749c0af3506446ac0a747a43ff53