Open requested to merge villaseca/SOL006:v2.6.1 into v2.6.1
It's needed in the context of the alignment of NFV SOL006 data model and OSM Information Model.
OSM uses pyangbind, a pyang plugin that generates the Python classes from YANG models. This plugin has an issue with nested choices, so this workaround removes the only occurrence of this event. This change doesn't modify the classes generated.