Fix a log message.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/V8Server/V8Job.cpp
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Disable a test in the cluster that needs transactions.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel