Conflicts: arangod/RestHandler/RestDocumentHandler.cpp arangod/RestHandler/RestEdgeHandler.cpp arangod/RestHandler/RestImportHandler.cpp arangod/V8Server/v8-vocbase.cpp arangod/VocBase/document-collection.c arangod/VocBase/document-collection.h arangod/VocBase/primary-collection.c arangod/VocBase/primary-collection.h