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