Revert "separate clean-env out into independent job for aws"
Revert "separate clean-env out into independent job for aws"

This reverts commit 5e8467b97f0e448bb9fd032116c4e3f03fbe7357.

rahulkj/pcf-pipelines,pvsone/pcf-pipelines,rahulkj/pcf-pipelines,sandyg1/pcf-pipelines,pvsone/pcf-pipelines,beibeiyang/pcf-pipelines,rahulkj/pcf-pipelines,sandyg1/pcf-pipelines,mcb/pcf-pipelines,cah-josephgeorge/pcf-pipelines,cah-josephgeorge/pcf-pipelines,BrianMMcClain/pcf-pipelines,beibeiyang/pcf-pipelines,mcb/pcf-pipelines,mcb/pcf-pipelines,sandyg1/pcf-pipelines,pivotal-cf/pcf-pipelines,pivotal-cf/pcf-pipelines,pvsone/pcf-pipelines,BrianMMcClain/pcf-pipelines,cah-josephgeorge/pcf-pipelines,pivotal-cf/pcf-pipelines,rahulkj/pcf-pipelines,pivotal-cf/pcf-pipelines,sandyg1/pcf-pipelines