Merge tag 'Smack-for-5.10' of git://github.com/cschaufler/smack-next