Allow setting max_servers and enable_dkim_verification
Merge branch '20140326_allow_setting_max_servers2'