Fix server tests broken by D1462817

Summary: When the main thread exits it calls ShutdownModules, which marks the extensions as unsorted.  Any unjoined threads will hit an assert when they exit.  In this case the 'watchdog' thread was joined a step too late in the shutdown process.

Reviewed By: @markw65

Differential Revision: D1562679
Convert some cg functions to SSA.

Summary: These are the easy cases that don't require conditionals
and phi nodes.

Reviewed By: @jasone

Differential Revision: D1556344
run test/tools/update-server-mode-blacklist.sh

Summary: @swtaarrs said this might fix the weird locale race

Reviewed By: @paulbiss, @swtaarrs

Differential Revision: D1564231