Update to use openid cloudfoundry resource only
Updates to event bus