Merging from cloudfoundry trunk

Take the latest from CloudFoundry trunk