Merge pull request #16492 from albers/completion-compopt-mac

[Fix 16348] Bash completion: avoid 'compopt: command not found' errors on Mac OS