Merge "Have init set up the backup stage dir on /cache"