Merge "Adds single NIC support for baremetal deployments"