Merge branch '6158-some-rspamd-templates-not-using-conf-custom-versions' into 'develop'

Resolve "some rspamd templates not using conf-custom versions"

Closes #6158

See merge request ispconfig/ispconfig3!1478