fixed memory zones
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
fixed memory zone mismatches