Ensure swift.conf created in all scenarios

Change I60fb78e5d40605ab47f349d154737ef9bab641f4 introduced a bug
wherein /etc/swift/swift.conf is getting created in consolidated
installs in which openstack::swift::proxy and
openstack::swift::storage-node classes are both applied to the same
server, but is not getting created on storage nodes in distributed
installs in which the proxy and storage-node classes are applied to
different servers.

Use ensure_resource wrappers around the swift class call to correct.

Change-Id: I692ddf5f344577705fc6a8652349f480ad21542d
Closes-Bug: 1287349
Unpin puppetlabs-apache fixture to use latest version

puppetlabs-apache >= 0.11.0 is required by horizon module.

Change-Id: Ic7990161b80cad9a72bb641d7b221433b1445d50
Closes-bug: #1287752
Merge "Ensure swift.conf created in all scenarios"