Support directory and user expansion#1657

waketzheng wants to merge 3 commits intoSupervisor:mainSupervisor/supervisor:mainfrom

waketzheng:support-directory-expansionswaketzheng/supervisor:support-directory-expansionsCopy head branch name to clipboard