svn merge of revisions with many conflicts in CHANGES, generated html and some changes that do not belong
+1: icing
*) mod_md: backport of mod_ssl changes to get interworking ACME support. Needs mod_md backport propoals above to find mod_md.h include file with otional functions.