FORGE-872 Fixed EL expressions generated for expanded entities.

Expansion of entities is done for 1:1 relationships and @Embedded entities. When generating EL expressions for the entity fields, the property name of the top level entity is remembered before expansion occurs, and is later used to correct the generated EL expression.
FORGE-572 Minor bugfix involving use of wrapper class.