merge from trunk:

core: Correct a regression since 2.0.x in the handling of AllowOverride
Options.

PR: 41829

Submitted by: Torsten Förtsch <torsten.foertsch gmx.net>
Reviewed by: niq, rpluem, trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@526912 13f79535-47bb-0310-9956-ffa450edef68