Merged revisions 3753-3756 from 3.0.5 stable branch.

git-svn-id: svn://svn.ispconfig.org/ispconfig3/trunk@3757 c1a6f2c7-8504-0410-933a-a4dae0184b0a