support specifying shortname in config
Merge branch 'client-shortname' into default-client
Merge branch 'default-client' into rabe