Remove an unnecessary TODO.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Repair distribute-sort-to-cluster rule and make it less aggressive.