Ensure each test is run with a clean conf file
Merge remote-tracking branch 'origin' into 17-update-sync-server