Merge "jjb: xci: Fix permissions in workspace before removing it"