missing ";"

Conflicts:
	main/mailfilter/stubs/amavisd.conf.mas
added pyzor dependency
cherry-pickL removed idle ebox.spamd, this has fixed the file ownership prolbems with pyzor and razor2

Conflicts:
	main/mailfilter/src/EBox/MailFilter/SpamAssassin.pm
	main/mailfilter/stubs/local.cf.mas
updated changelog. Remove remains of spamd daemon
reformat
migration to get rid of ebox.spamd instances
added spf dependency, enable dkim
remove superfluous laod plugin dkim
Merge pull request #214 from Zentyal/jag/mailfilter-sa-enh

Dont run superfluous spamd damon, more SA test enabled