fixed issue #883: arango 2.1 - when starting multi-machine cluster, UI web does not change to cluster overview

Conflicts:
	CHANGELOG
	lib/ShapedJson/shape-accessor.c
	lib/ShapedJson/shape-accessor.h
slightly changed return values in TRI_ExtractShapedJsonVocShaper
fixed order of checks

Conflicts:
	arangod/VocBase/voc-shaper.c
fixed null
added define for random vs rand

Conflicts:
	CHANGELOG
	VERSION
	build.h
	configure
	configure.ac
fixed merge conflict