Submitted by: sf

Reviewed by: sf, trawick, covener

Merge r1304852 from trunk:

Fix merging of AllowOverrideList and ContentDigest.
Remove some useless code.
Pointed out by covener



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