Fix bad git merge.
Fix bad git merge.

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

Signed-off-by: Beyhan Veli <0702de361e3c91d973ce2c0ee3e34845ebaf95e6@sap.com>

cloudfoundry-incubator/bosh-aws-cpi-release,cloudfoundry-incubator/bosh-aws-cpi-release,cloudfoundry-incubator/bosh-aws-cpi-release