CA-147516: networkd fix for VLANs plus enic-workaround
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 <8783b3376fb07d39edffc8d7da68a6de3874a7e6@citrix.com>

koushikcgit/xcp-networkd,koushikcgit/xcp-networkd,djs55/xcp-networkd,sharady/xcp-networkd,sharady/xcp-networkd,djs55/xcp-networkd