fixed too eager duplicates check for shaper
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	lib/V8/v8-conv.cpp