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
Revert "Merge branch 'jag/modules-clean-reprovision'"

This reverts commit b54bdc0938db65c1b815b84250ee817cc8445150, reversing
changes made to c8708da2a124396674cfb6ccbacd78bbcf8d6139.

Conflicts:
	main/samba/ChangeLog
only execute migration from 3.4 and not 3.5.0
Merge branch 'master' into jacalvo/migration-from-3.4

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

Jacalvo/migration from 3.4
Merge branch 'jacalvo/migration-from-3.4'
change dropSOGODB name
Merge branch 'master' into modules-clean-reprovision

Conflicts:
	main/openchange/src/EBox/OpenChange.pm