Merge "Create the rollback directories in init"