Merge pull request #17229 from mavenugo/ds_fix

Fixing bootup inconsistencies due to invalid cluster-store config