Unparseable endpoint URL's should raise friendly error

  fixes bug #1058494

Change-Id: Id89c530e2f4e7dcf0db03515afb8b2a85fbf8077
Fix catalog when services have no URL

This fixes bug #1061736

Change-Id: Ic8f7a45dfabb2e3fb40f6aa6cd4c0f29c13f2c77
Signed-off-by: Julien Danjou <julien@danjou.info>
Merge "Unparseable endpoint URL's should raise friendly error" into stable/folsom
Merge "Fix catalog when services have no URL" into stable/folsom