More changes for 2.4.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel