Merge pull request #9291 from vincentbernat/fix/zsh-completion-update-2

zsh: correctly parse available subcommands (completion)