changes for #2368
fix for 2499
Merge branch 'build' of https://github.com/mconstantin/nuxeo-drive into build