Preparing for change in ClusterService/Store implementation.
10 files changed