Patch misc

Helmorequested to merge
helmo/ispconfig3:patch-misc into stable-3.1

Commits for #5476 (closed) and a few minor things I ran into.

Merge request reports