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