Don't add v[12] to URLs in Keystone service catalog

Change-Id: I073bf4f279d08957ef28f492c3185dd2a0f2d3e2
Fixes: rhbz#905081
Merge "Don't add v[12] to URLs in Keystone service catalog" into folsom