Unordered: Merge to release. Fixes #6522.
Fixes undefined macros, removes some unused code and fix some potential issues for when std::allocator_traits is used.
std::allocator_traits