Make correct parts on DBserver MAIN and DEPENDENT.

Seems not to work yet because of more fundamental problems.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Fix instanciation of queries in which a sharded collection is used >=2 times.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel