CORE-4600 Updates for new DiskResourceRefreshEvent.
Merge branch 'master' into data-svc-caching
Merge branch 'v1.8.2' into data-svc-caching
Merge branch 'v1.8.2' into data-svc-caching
Merge branch 'master' into data-svc-caching
Merge branch 'data-svc-caching'