Change conditionals to ensure blocks for deploy jobs.
Change conditionals to ensure blocks for deploy jobs.

[#100474028](https://www.pivotaltracker.com/story/show/100474028)

Signed-off-by: Scott Weiss <c131bbdcbdcedaee666cc960f646505569f0b8f5@emc.com>

tracyde/bosh-aws-cpi-release,wcamarao/bosh-aws-cpi-release,ritazh/bosh-aws-cpi-release,jfuerth/bosh-aws-cpi-release,ritazh/bosh-aws-cpi-release,jfuerth/bosh-aws-cpi-release,wcamarao/bosh-aws-cpi-release,sedouard/bosh-aws-cpi-release,wcamarao/bosh-aws-cpi-release,tracyde/bosh-aws-cpi-release,tracyde/bosh-aws-cpi-release,sedouard/bosh-aws-cpi-release,cloudfoundry-incubator/bosh-aws-cpi-release,ritazh/bosh-aws-cpi-release,cloudfoundry-incubator/bosh-aws-cpi-release,cloudfoundry-incubator/bosh-aws-cpi-release,sedouard/bosh-aws-cpi-release,jfuerth/bosh-aws-cpi-release