Fix `--cluster-store` option parser Upstream-commit: c7b65288e458f51ea2d5adcb8692c279726a8292 Component: engine