Merge branch 'ab/common-main-cleanup'

Code clean-up. * ab/common-main-cleanup: common-main.c: call exit(), don't return