Have the service catalog ignore empty urls

The service catalog was ignoring None for URLs, but not empty
strings.  This change should hit both cases.

Change-Id: I72ec344ff3f24fcd960023be5e39294c6b12ce34
Merge "Have the service catalog ignore empty urls"