Import apache2 version 1.8.4
Merge branch 'chef-vendor-apache2'

Conflicts:
	cookbooks/apache2/CHANGELOG.md
	cookbooks/apache2/README.md
	cookbooks/apache2/attributes/default.rb
	cookbooks/apache2/attributes/mod_auth_cas.rb
	cookbooks/apache2/attributes/mod_auth_openid.rb
	cookbooks/apache2/attributes/mod_ssl.rb
	cookbooks/apache2/definitions/apache_conf.rb
	cookbooks/apache2/definitions/apache_module.rb
	cookbooks/apache2/definitions/apache_site.rb
	cookbooks/apache2/definitions/web_app.rb
	cookbooks/apache2/files/default/apache2_module_conf_generate.pl
	cookbooks/apache2/files/default/tests/minitest/default_test.rb
	cookbooks/apache2/files/default/tests/minitest/god_monitor_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_apreq2_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_auth_cas_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_auth_openid_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_cgi_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_dav_svn_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_fastcgi.rb
	cookbooks/apache2/files/default/tests/minitest/mod_include_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_perl_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_php5_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_python_test.rb
	cookbooks/apache2/files/default/tests/minitest/mod_ssl_test.rb
	cookbooks/apache2/files/default/tests/minitest/support/helpers.rb
	cookbooks/apache2/metadata.json
	cookbooks/apache2/metadata.rb
	cookbooks/apache2/recipes/default.rb
	cookbooks/apache2/recipes/god_monitor.rb
	cookbooks/apache2/recipes/iptables.rb
	cookbooks/apache2/recipes/logrotate.rb
	cookbooks/apache2/recipes/mod_actions.rb
	cookbooks/apache2/recipes/mod_alias.rb
	cookbooks/apache2/recipes/mod_apreq2.rb
	cookbooks/apache2/recipes/mod_auth_basic.rb
	cookbooks/apache2/recipes/mod_auth_cas.rb
	cookbooks/apache2/recipes/mod_auth_digest.rb
	cookbooks/apache2/recipes/mod_auth_openid.rb
	cookbooks/apache2/recipes/mod_authn_file.rb
	cookbooks/apache2/recipes/mod_authnz_ldap.rb
	cookbooks/apache2/recipes/mod_authz_default.rb
	cookbooks/apache2/recipes/mod_authz_groupfile.rb
	cookbooks/apache2/recipes/mod_authz_host.rb
	cookbooks/apache2/recipes/mod_authz_user.rb
	cookbooks/apache2/recipes/mod_autoindex.rb
	cookbooks/apache2/recipes/mod_cgi.rb
	cookbooks/apache2/recipes/mod_dav.rb
	cookbooks/apache2/recipes/mod_dav_fs.rb
	cookbooks/apache2/recipes/mod_dav_svn.rb
	cookbooks/apache2/recipes/mod_deflate.rb
	cookbooks/apache2/recipes/mod_dir.rb
	cookbooks/apache2/recipes/mod_env.rb
	cookbooks/apache2/recipes/mod_expires.rb
	cookbooks/apache2/recipes/mod_fastcgi.rb
	cookbooks/apache2/recipes/mod_fcgid.rb
	cookbooks/apache2/recipes/mod_filter.rb
	cookbooks/apache2/recipes/mod_headers.rb
	cookbooks/apache2/recipes/mod_include.rb
	cookbooks/apache2/recipes/mod_ldap.rb
	cookbooks/apache2/recipes/mod_log_config.rb
	cookbooks/apache2/recipes/mod_logio.rb
	cookbooks/apache2/recipes/mod_mime.rb
	cookbooks/apache2/recipes/mod_negotiation.rb
	cookbooks/apache2/recipes/mod_perl.rb
	cookbooks/apache2/recipes/mod_php5.rb
	cookbooks/apache2/recipes/mod_proxy.rb
	cookbooks/apache2/recipes/mod_proxy_ajp.rb
	cookbooks/apache2/recipes/mod_proxy_balancer.rb
	cookbooks/apache2/recipes/mod_proxy_connect.rb
	cookbooks/apache2/recipes/mod_proxy_http.rb
	cookbooks/apache2/recipes/mod_python.rb
	cookbooks/apache2/recipes/mod_rewrite.rb
	cookbooks/apache2/recipes/mod_setenvif.rb
	cookbooks/apache2/recipes/mod_ssl.rb
	cookbooks/apache2/recipes/mod_status.rb
	cookbooks/apache2/recipes/mod_wsgi.rb
	cookbooks/apache2/recipes/mod_xsendfile.rb
	cookbooks/apache2/templates/default/a2enmod.erb
	cookbooks/apache2/templates/default/apache2.conf.erb
	cookbooks/apache2/templates/default/default-site.erb
	cookbooks/apache2/templates/default/mods/alias.conf.erb
	cookbooks/apache2/templates/default/mods/auth_cas.conf.erb
	cookbooks/apache2/templates/default/mods/autoindex.conf.erb
	cookbooks/apache2/templates/default/mods/deflate.conf.erb
	cookbooks/apache2/templates/default/mods/dir.conf.erb
	cookbooks/apache2/templates/default/mods/fastcgi.conf.erb
	cookbooks/apache2/templates/default/mods/fcgid.conf.erb
	cookbooks/apache2/templates/default/mods/mime.conf.erb
	cookbooks/apache2/templates/default/mods/negotiation.conf.erb
	cookbooks/apache2/templates/default/mods/proxy.conf.erb
	cookbooks/apache2/templates/default/mods/setenvif.conf.erb
	cookbooks/apache2/templates/default/mods/ssl.conf.erb
	cookbooks/apache2/templates/default/mods/status.conf.erb
	cookbooks/apache2/templates/default/ports.conf.erb
	cookbooks/apache2/templates/default/security.erb
	cookbooks/apache2/templates/default/web_app.conf.erb