Revert "Populate service list with availability zone"

This reverts commit 20ba7028fc406509c5f8430f79f7153f359d87af. This
commit broke unittests which was not caught due to a bug in the way
testr was run through setup.py. Revert the commit to fix the unittests
so that a fix to the way testr is run can merge.

Change-Id: Ie4644a3177d9628607c0d632190c4e48942070d7
Merge "Revert "Populate service list with availability zone""