gcc
unify function behavior in shell and server
added derived file
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel