Merge pull request #17 from jrperritt/5

Use EndpointOpts to query ServiceCatalog for endpoint for Identity service clients