Unify ContextElement class into Entity class#3301

Merged

AlvaroVega merged 4 commits intomasterfrom hardening/1298_unify_entity_clases

Sep 27, 2018

+6,653-5,227

Commits on Sep 21, 2018

FIX ContextElement class removed in favour of Entity class, along with several derived changes
fgalan
committed
FIX utest aligned with latests changes
fgalan
committed

Commits on Sep 24, 2018

FIX typos raised in review
fgalan
committed

Commits on Sep 26, 2018

FIX issues raised during code review
fgalan
committed