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>
(cherry picked from commit 6bb1dccf4fa701f1fa6bb77dba1047812d7e268e)
Merge "Bug 2117: Inner grouping used in outer grouping's choice case" into stable/helium