Disable heat for RHOS, backport swift ring builder for RHOS 3.0

Heat manifests still lack qpid support, so it needs
to be disabled during deployment.
Swift ring builder output changed for Havana, but a backport
is needed for RHOS 3.0.
Changes marked as FIXME

Change-Id: I75ec9c861119f975fa37cac875c5203272443ed8
Closes-Bug: #1263359
Related-Bug: #1263331