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
(cherry picked from commit 4b9e74a7a275f32217d86487f975c8ded85317b2)
Update for 3.0.0-rc2

Updated .gitreview to use stable/havana branch. Updated Modulefile
with current version and dependencies for new Heat and
Ceilometer releases.

Change-Id: Ied48ec68ace77fbdfa47216d8d32e531c320bcd3
Merge "Update for 3.0.0-rc2" into stable/havana