Fix bugs when merging empty .ctp files

Update ctx_health_check.c command line arg parsing

Added `ctx31 check` call to test/thread_pe/Makefile