Changes to support Cloudfoundry multi-node