Removed cherry pick for heat templates

The heat templates change[1] merged and so the cherry pick
was removed.

[1] https://review.openstack.org/#/c/123713/