Merge "Fix workdir for latest xrally images"