[M] Change in osmo-ttcn3-hacks[master]: dia2gsup: initial refactoring