Merge branch 'fix-vlan-allocation-order-typo' into 'master'

Fix allocation order on vlan.

See merge request !6834

(cherry picked from commit 16be4dab)

8effc746 Fix allocation order on vlan.