Updated cf and bosh stemcell versions and some minor cleanup