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

* commit 'f43ff684470cafe6819b1df7461ee83322f27af8':
  Rename Entry class in TreeMap