Thanks Anno,
I've made minor modifications to your patch and added a second commit that removes the stanza listener related code from DataListener since it's now a plain IqRequestHandler.
I'm currently uploading a rc3-SNAPSHOT that includes all the fixes. As always, please test and report back.
I've also fixed (I think) the outstanding stream management issue. Therefore I hope that all blockers for the 4.1 release are now solved and that I can release soon a last rc3 before 4.1