Removed cherry pick for heat templates
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/

dmsimard/instack-undercloud,eprasad/instack-undercloud,eprasad/instack-undercloud,bcrochet/instack-undercloud,rdo-management/instack-undercloud,rdo-management/instack-undercloud,dpkshetty/instack-undercloud,agroup/instack-undercloud,dmsimard/instack-undercloud,agroup/instack-undercloud,dpkshetty/instack-undercloud,bcrochet/instack-undercloud