Get rid of template parameters for make_pair in one place.
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding