Added in container_traits and adjacency_list patches to fix unordered container issues (patch from #3972); fixes #3972