discovery: add command line flag for discovery-proxy
Merge pull request #1646 from jonboulle/1536_disco_proxy

discovery: add command line flag for discovery-proxy