This fixes service cleanup. Keystone resources are only cleaned up if
they have the correct magic prefix, but services were not reliably
created with that prefix.
This also adds some logging that made it easier to discover this
issue, and fixes a few minor typos.
Closes-Bug: #1474322
Change-Id: Ic58271bbc9a84feff4f60229a66e0ca00834a79c