Get rid of some TODOs and FIXMEs.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel