hotproc : More merge cleanups
Add a QA test
Fix an error if started without a config file