3.3.0p2: Merge branch 'ispconfig-3-3-p2' into 'develop'

Fixes for ISPConfig 3.3 Patch 2

Closes #6869, #6884, #6885, #6889, #6890, and #6881

See merge request ispconfig/ispconfig3!2025