Bug 2117: Inner grouping used in outer grouping's choice case

Inner grouping(s) of outer grouping(s) found and handled properly

Change-Id: I09853215febf47312b431976ad096d1ee774c9f6
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
Merge "Bug 2117: Inner grouping used in outer grouping's choice case"