Move removal of extra tags after a particular tag is checked out

Also remove patch to fix tags under
keystone-client and quantum-client.

Change-Id: I4f4d8fed9f9b3674d6155a2213cac45349bef72f
Fixes: bug #1190588