Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into next...