Merge "[baremetal] cleanup: Parameterize VCP hostnames"