Merge "[baremetal] Fixup pike deployment (2)"