Merge "Update server nic handling for LXD style nic names"