Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into pregel
fixed tests for remove-unnecessary-remote-scatter and undistribute-remove-after-enum-coll, renamed distributeInCluster to scatterInCluster.
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into pregel
attempt to fix cluster startup
Merge branch 'pregel' of https://github.com/triAGENS/ArangoDB into pregel