Make Swift *_PORT_BASE configurable

DevStack's Swift port defaults changed in the Grizzly cycle, we need to
put it back to complete the upgrade without going through the ring build process.

Change-Id: I30c09839690ad7ba9bb3fdffa3f05aedfc47559e
Merge "Make Swift *_PORT_BASE configurable"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp