Fixed missing vlan_id handling for adding nics.
Merge branch 'test' into dev