turn off swift by default

swift port selection is still really suboptimal. 6011 is often used
by ssh x-forwarding, so if you are sshed into the box with
x-forwarding, then one of the swift services doesn't start.

disable this until we figure out a better path to port selection.

Change-Id: I62b9f96f24118ddfc962715e55b34c05dbe03a1b
Merge "turn off swift by default"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp