Merge "Show storage manager settings using a system property." into nyc-mr1-dev