* 'devel' of https://github.com/arangodb/arangodb: (25 commits)
Revert "Implement shardorganizer...Cluster with 1 DBServer possible again"
remove unused variable
Move FM.listJson into aardvark
Remove unused legacy FM test
Implement shardorganizer...Cluster with 1 DBServer possible again
Make sure the bundle doesn't exist before loading it from db
More meaningful object logging
Response -> IncomingResponse
Updated plain cache to properly count evictions.
More realistic binary document test
Simplified Foxx self healing (#2511)
fix superfluous re-creation attempts for collections
Made shortest path OOM test deterministic
added documentation
sync ENGINE file
adjusted ui to internal cluster api
fix usage of su
Fixing various issues
Fixing catch test
fixed vertexId getter
...