Merge "Move VIRL jobs to ondemand"