BZ1047879 - GRE regression in handling nested enum values
(cherry picked from commit b5cba11308018299ee23fabe5f39ea366201d772)
BZ1047879 - GRE regression in handling nested enum values. Fixes for tests.
(cherry picked from commit 4ad141ca582a3d30eb64d10b84a6ce97f2a98e97)