Merge branch 'jk/common-main'

Fix for a small regression in a topic already in 'master'. * jk/common-main: common-main: stop munging argv[0] path