Some cleanups. Also turn caching of CF spaces back on. Getting them is really slow.
Merge branch 'cf-deploy' of github.com:eclipse/flux into cf-deploy