Wip 8621

Fixes for civetweb, including submodule update. Submodule itself has a few more fixes.