State before moving DB/Coll Ops to ClusterInfo.
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding

Conflicts:
	arangod/V8Server/v8-vocbase.cpp