abstract class BlockWithClients to contain Scatter/DistributeBlocks
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/ExecutionBlock.h