Merge "Fix and improve ServiceClients docstring examples"