*: support discovery fallback
discovery: consolidate proxyDiscover and Discover interface
Merge pull request #1604 from xiangli-cmu/fallback_proxy

*: support discovery fallback