Select service end-point based on specified serviceName.

If serviceName is null, then the default/primary service endpoints are selected.
Otherwise, matching endpoints for the specified serviceName is used (from additional endpoints).
Merge branch 'master' of github.com:birmiwal/commons