CA-147516: networkd fix for VLANs plus enic-workaround

When the "enic" workaround from c5ebbb8a2 is in effect, we need to make sure
that VLAN names (for additional VLANs) are still constructed correctly, as usual.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>