Sort out static analysis.
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2