Merge branch 'fc/comp/fixes' into integration

Merge branch 'fc/comp/fixes' into integration

* fc/comp/fixes:
  Revert "Update documentation occurrences of filename .sh"
  completion: prompt: fix for Zsh
  completion: zsh: fix for directories with spaces
  completion: zsh: improve main function selection
  completion: add missing fetch options
  completion: bash: cleanup cygwin check
  completion: zsh: trivial cleanups
  completion: remove zsh hack
  completion: zsh: don't hide ourselves
  completion: bash: remove zsh wrapper
  completion: bash: remove old wrappers