Import apt version 2.3.0
Import apache2 version 1.8.4
Revert "Import apache2 version 1.8.4"

This reverts commit f92fe53e3a28396e0ca97dedd9d91b9b4d021844.
Import apache2 version 1.8.4
Revert "Import apt version 2.3.0"

This reverts commit 8006e06b4c4f4ddde9b1c6cf64179618518020fd.
Import apt version 2.3.0
Merge branch 'chef-vendor-apt'