Revert "Bug 5829 - New yang parser allows two choice cases with identical child elements"