Merge branch 'dns-dnssec-fix-dbmaster' into 'stable-3.1'

Till Brehm

2016-04-12 c92a4ee47ce5a7bb6b0e32a321ce09fece3e11dc

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