Merge branch 'smack-for-4.19-a' of https://github.com/cschaufler/next-smack into next-smack

From Casey Schaufler.