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

@kernevil: make variables configurable/editable through configuratoin file rather than hardcoded