Stop cherry-picking the storage templates patch

The patch adding object & block storage templates was merged:

https://review.openstack.org/#/c/123713/