Merging from cloudfoundry trunk

Taking the latest code