Fix vlan lookup.

10 jobs for !6420 with issue-1822-clear-VC in 16 minutes and 50 seconds (queued for 3 seconds)
latest merge request