Merge "Switch to cirrors 0.3.5 also for the xen case"