Merge tag 'smack-for-5.4-rc1' of git://github.com/cschaufler/smack-next