Fixed error message
Removed deprecated objectClass objects not required anymore because Windows breaks when creating objects with those unused objectClass
Merge branch 'cperello/minor-fixes'

Conflicts:
	main/samba/ChangeLog