Further changes to support Spring boot in CF.