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