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