Merge "Fixes baremetal noha deployments"