Merge "Bug 2271 - NPE during generation of java binding for case list-grouping-choice"