Fix linking problem on Linux.
Merge branch '2.2' of ssh://github.com/triAGENS/ArangoDB into 2.2

Conflicts:
	lib/JsonParser/json-parser.ll
Add disabled tests.

Disable shell-readonly test on server.
Recognise Jasmin tests for shell_server tests in JS framework.