Add missing info to docstring.

The example return value in this docstring did not reflect that the zone
for each service is included as well.  Add 'zone', and also add a
compute of compute entries to the list.

Fix bug 1159897.

Change-Id: I8979a4a307d0ad77e8eff4fa71e0be3062a526e2
Merge "Add missing info to docstring."
Merge remote-tracking branch 'm_src_repo/master' into build-temp