keyboard stuff

CLI: update subcommands to use return instead of exit() (#10323) master