Fix Linux conflict after merge from upstream
Merge branch 'master' of github.com:OpenDataSpace/CmisSync