added test case for shape movements
more barriers

Conflicts:
	arangod/V8Server/v8-vocbase.cpp
merge
slightly changed return values in TRI_ExtractShapedJsonVocShaper