Use region_name in service catalog

Using attr and filter is no longer necessary. We provide a region_name
filter directly that works with both v2 and v3 service catalogs.

Change-Id: I67b50fcaa5e4df5c2bb7b2966b5ef2040e6286e7
Merge "Use region_name in service catalog"