updated to work with PCF and spring cloud extensions