XEP-0198 fixes

Fixes for:

* Race conditions
* Spurious bind on reconnect (disallowed by newer servers)