making service catalog for endpoints more configurable

When creating a client you may need the client to be something other
than the endpoint type of 'publicURL'. This will allow you to
overwrite the endpoint type of each service client.

Closes-Bug: #1389885
Change-Id: I117b2ec9397f5bdbc0861902e7e502a86a7b3c9e