Merge "Bug 1029: Remove dead code: clustered-data-store"