Merge pull request #9863 from albers/bash-completion

Add options to bash completion and sort options