utils: fix modtool template output signature
Merge branch 'maint'
Merge branch 'master' into next