Fix DBserver bug with CollectionNameResolver and local collections.
Merge branch 'pregel' of ssh://github.com/triAGENS/ArangoDB into pregel