Merge "Bash completion: Fix ls options and also support "shell cat""