Do some changes suggested by people in the C++ UG DUS.
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2