fixed 2482
fix for 2504
fix for 2508
Merge branch 'build' of https://github.com/mconstantin/nuxeo-drive into build