test data: rebase dia sml after fixes to stereotypes
cpp: fix key generation in formatters
sml: fix concept expansion in resolver