update template to take elb from prod-aws/cf-aws-stub.yml
Merge git://github.com/cloudfoundry/cf-release