Merge pull request #202 from ethanbao/remote_master

Fallback to use new discovery uri pattern when the old one fails.