migrate attributes from ldap to ldb when upgrading
make adding of objectclass idempotent
map accounts when migrating
first schema fixes
quota upgrade
Merge branch 'master' into jacalvo/migration-from-3.4
added changelog entry
map accounts when migrating from 3.4
use samAccountName instead of gid
only execute migration from 3.4 and not 3.5.0
Merge branch 'master' into jacalvo/migration-from-3.4

Conflicts:
	main/samba/ChangeLog
Merge pull request #1462 from Zentyal/jacalvo/migration-from-3.4

Jacalvo/migration from 3.4