Create working path if it doesn't exist

And change behaviour to allow us to never delete things.

Change-Id: Ibf5e7c1075e9236c65a4eda044403c4c4cc9f38a
Merge remote-tracking branch 'origin/master' into deploy

* origin/master:
  Create working path if it doesn't exist

Change-Id: I7f4ee30dae75932d170d1af1464419ee82438e0a