Merge pull request #516 from psav/fix_provider_discovery

Fix provider discovery to wait for one provider