Merge "Add a flag to toggle how much the storage manager should retain." into nyc-mr1-dev