Amavis configuration update.

see #608
Merge branch '1.1.x'

Conflicts:
	doc/getting_started/plugins.rst