Fixed modules that are not able to handle multiOU to keep using ou=Users,.... by default
Moved ZarafaCompany objects root into ou=zarafa from ou=Users because Samba doesn't allow ou creation under CN=Users.
Code cleanup
Merge branch 'master' into cperello/ou-fixes
Merge pull request #505 from Zentyal/cperello/ou-fixes

Cperello/ou fixes