Merge branch '3817-AddClientIdResellerToken' into 'stable-3.1'

Till Brehm

2016-04-06 1e33ee2d84585ce7e4eefd442c7f5726128f8177

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;