Migrate disabled accounts from 3.0
Disable load_url_list by default to reduce CPU and memory usage
Merge pull request #624 from Zentyal/jacalvo/migrate-disabled

Migrate disabled accounts from 3.0
Override daemons when migrating from 3.0
Merge pull request #625 from Zentyal/jacalvo/migrate-daemons

Override daemons when migrating from 3.0
Do not try to migrate from 3.0 if module is not configured
Merge pull request #626 from Zentyal/jacalvo/fix-migration-unconfigured

Do not try to migrate from 3.0 if module is not configured
Set ham and spam users as internal when migrating from 3.0
Merge branch 'master' into rduran/user-groups-sync

Conflicts:
	main/samba/ChangeLog
	main/users/ChangeLog