Merge branch 'ticket31705_v2' into ticket31705_v2_merged

Conflicts:
	src/feature/dirparse/authcert_parse.c
	src/feature/dirparse/ns_parse.c
	src/feature/hs/hs_service.c
	src/lib/conf/conftesting.h
	src/lib/log/log.h
	src/lib/thread/threads.h
	src/test/test_options.c

These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.

src/lib/dispatch/dispatch_naming.c

@@ -33,6 +33,7 @@ dispatch_naming_init(void)
 {
 }
 
+#ifndef COCCI
 /* Helper macro: declare functions to map IDs to and from names for a given
  * type in a namemap_t.
  */
@@ -56,6 +57,7 @@ dispatch_naming_init(void)
     return namemap_get_size(&type##_id_map);                            \
   }                                                                     \
   EAT_SEMICOLON
+#endif
 
 DECLARE_ID_MAP_FNS(message);
 DECLARE_ID_MAP_FNS(channel);