Collection of minor cleanup commits See merge request ispconfig/ispconfig3!1679
mentioned in commit 9d27652f