Allow running of proxy and storage on the same node.

This adds conditionals to support a installation
in which a user desires to run both swift proxy and
storage on the same node.

Change-Id: I0cc827525968a9d1dc836c553a39f0ac13c4667e
(cherry picked from commit af129f0a93009293dba610ee487a41fb15027336)