Import discovery client from discoveryclient package. If this fails, try from the server. TODO - Import from the server should be taken out