merged
fixed generation of <nabl-def-scope> clauses
after fix for non-determinism in external and anonymous scopes