Fix bug parsing out expressions for enumeration types
Merge remote-tracking branch 'e-iceman/BroadleafCommerce-3.0.x' into BroadleafCommerce-3.0.x