code cleanup
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding