**This patch is a merge of 2 patches that needed to be backported**
unwedge the gate
devstack defaults to v3 and makes some janky assumptions in
the generated rc files
(cherry picked from commit bd14d078098eb2055c0dae784de892b0b1346ed5)
Add all regions to cloud configuration
OCC now requires all regions to be listed in the cloud
configuration. Update the shell unit tests to list all
of the regions being tested.
Change-Id: Ic7300d1f708339701b5daadbf2c4769b239a2adb
(cherry picked from commit d1311f9742ad93198b9ca72f47d51710e17ced38)