Merge change 23918 into eclair

* changes:
  do not merge: Josh's optimized HashMap and Hashtable