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

@javierag, @jacalvo: debian/ does not fit into openchange tree, can you remove it from master and maintain it similarly to the debian branch?