Merge "jjb: xci: Refactor bifrost jobs to use the XCI clean VM"