Don't cherry-pick the compute & control templates

https://review.openstack.org/#/c/123100 has been merged.