Fix log format for http server and http channel objects
Merge remote-tracking branch 'upstream/master' into inline_comment_prefixes
Add inline_comment_prefixes support to supervisorctl's config (for Py3)