merge changes for StEP00271 to trunk, re #4064


git-svn-id: svn://develop.studip.de/studip/trunk@33070 c5b85792-5220-0410-ad23-ed5b6b8ad999