"Options +Includes" wasn't corrently merged if "+IncludesNoExec"

was defined in a parent directory.

Submitted by:	Lars Eilebrecht


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@80720 13f79535-47bb-0310-9956-ffa450edef68