Merge pull request #49 from Zentyal/Contrib

Several patches for the OpenChange integration