Merge branch 'dns-dnssec' of git.ispconfig.org:darkalex/ispconfig3 into dns-dnssec

Conflicts:
	install/sql/incremental/upd_dev_collection.sql