Merge tag 'Smack-for-6.4' of https://github.com/cschaufler/smack-next