Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev