Merge "Rename Entry classes in HashMap and LinkedHashMap." into lmp-mr1-enso-dev