Merge change Ib5dc3f1f into eclair

* changes:
  Fixing a lame test that was relying on hashmap iteration order.