civetweb: combine various submodule changes

There were some accidental reverts, fixes, re-reverts,
and follow-on changes that are hard to follow and in the
end did not include what we want.  Merge it all together.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/civetweb b/src/civetweb
index 8d271315a541218caada366f84a2690fdbd474a2..e12494070432b85d5ffce7dece81c0baad457a5f 160000 (submodule)
--- a/src/civetweb
+++ b/src/civetweb
@@ -1 +1 @@
-Subproject commit 8d271315a541218caada366f84a2690fdbd474a2
+Subproject commit e12494070432b85d5ffce7dece81c0baad457a5f