XEP-0198: another race condition

Delay stream enablement until resource is bound for sure
Fix duplicate ServiceDiscoveryManager