Revert "Removed apache state in favor of the apahe formula"

This reverts commit b1e30f8db46e8e3372a44c2d4fd189f6142d8c75.

The Apache state will require the full Salt 0.17 (not just the grains
module).