Fix: Infinite Loop Produced
This is the rebuild necessary in the order of operations to resolve the selections first, then expand them to include subchoices.

Issue#: CODE-2504


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@23228 ef53c05b-3124-4d59-ae7d-fe3273f42be7