Conflicts: arangod/VocBase/compactor.c arangod/VocBase/document-collection.c arangod/VocBase/synchroniser.c arangod/VocBase/vocbase.c