merged latest branches/2.4.x changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703838 13f79535-47bb-0310-9956-ffa450edef68

diff --cc CHANGES
index ff28410f54e22cb830fcc5196e02a3ee9123c514,89fade278ed3adba88285c3941bbc18907272628..daf96b42515db7d706bb8ec5fbdb3c6700b9b9eb
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,9 -1,10 +1,12 @@@
                                                           -*- coding: utf-8 -*-
  
  Changes with Apache 2.4.17
 +  *) mod_h2: added donated http/2 implementation to build system. Similar
 +     configuration options to mod_ssl. [Stefan Eissing]
  
+   *) mod_autoindex: Allow autoindexes when neither mod_dir nor mod_mime are
+      loaded. [Eric Covener]
+ 
    *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting
       ';' as an alternate separator.  PR47241. 
       [<bugzilla schermesser com>, Eric Covener]

diff --cc server/core.c
Simple merge