Merge remaining Zentyal changes to openchange master and gets everything sync'ed

@javierag: please remove changelog (not maintained and less accurate than git log)