fixed default behavior of merge

Conflicts:
	arangod/Aql/ModificationOptions.cpp
	arangod/Aql/ModificationOptions.h
added tests for mergeObjects
updated test for mergeArrays
added derived file