Fixing bootup inconsistencies due to invalid cluster-store config Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668 Component: engine