Allow running of proxy and storage on the same node.

This adds a if defined check to avoid class conflicts
when running swift proxy and storage on the same node.

Change-Id: I60fb78e5d40605ab47f349d154737ef9bab641f4
Merge git://github.com/puppetlabs/puppetlabs-openstack