Require the HTTP config file on all OS.

This is required on newer versions of puppet
otherwise it will automatically remove it.

Change-Id: I1f64ca0d2df497b0da565340b31ce091472ffe76
Fix rspec tests to support latest apache module

Latest apache module requires new dependencies: concat and firewall.

It now requires those facts:
* operatingsystemrelease
* concat_basedir (required by concat)

Change-Id: Ic561ec756c844c3b3cbe0c441a3d9a0d8c1abe9b
Merge "Require the HTTP config file on all OS."