Fixed nondeterministic xjc outcome for complex choice types

Signed-off-by: Martin Vojtek <martin.vojtek@oracle.com>