Merge "Create the rollback directories in init (1/n)"