don't use obsolete getResource JID's method
Merge branch 'master' into resource-picker