Conflicts were from code removed
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel