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

Shouldn't we use lpcfg_sam_name instead?