added more collect special cases
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
test for std::unordered_map::emplace()