Jkerihuel/sync master

Synchronize all changes from openchange/openchange master to reduce future path of inconsistencies and ease the forthcoming repository reunification.