Merge "Rename Entry class in TreeMap" into lmp-mr1-enso-dev
am: a5c16db453

* commit 'a5c16db453098d7ab945edd379a2d52a1465682b':
  Rename Entry class in TreeMap