storage: using datagrid for rebind

PR to get my commits into a branch "feature/storage2" on brooklyncentral/brooklyn, so easier to work with Peter (rather than both working off my personal branch).