fixed cerberus path
Merge branch '2.3' of github.com:triAGENS/ArangoDB into 2.3

Conflicts:
	CHANGELOG
Revert "Fix cluster-wide locking for AQL."

This reverts commit 8c9e42005d2a4b919975026b0d171dcfffe4f823.
Revert "Squashed commit of the following: organise locking in distributed AQL"

This reverts commit 95779da06253ef9a151d56b5c6c1807f95b9e1c7.
release version 2.3.4