Master removecloudfoundry

This is a cherry pick of pr:
https://github.com/brooklyncentral/brooklyn/pull/673

it applies the pr to master instad of 0.5.