Use the discovery client from api-venv instead of system discoveryclient
Merge pull request #321 from Juniper/rrugge-ocs

Use the discovery client from api-venv instead of system discoveryclient