Take 2 - try to fix NPE when getting user presence
Merge branch 'OpenfireDEMO' into release-4.6-unstable