Merge "Fixes network/inventory checks for baremetal deployments"