Merge r291120 from trunk:

* server/request.c (core_opts_merge): When AllowOverride is specified
for the directory, ignore the inherited override_opts field.

PR: 35330
Submitted by: kabe <kabe sra-tohoku.co.jp>
Reviewed by: jorton


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