refactoring
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2