auto merge of #1592 : pcwalton/servo/concurrent-hash-map, r=larsbergstrom

This will be used for leaf sets and interned strings.

r? @larsbergstrom
layout: Consolidate passes in the sequential path that were consolidated
in the parallel path.