Upgrade to upstream ModSecurity 2.7.4
Merge branch 'mod_security-2.7.4'