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

From Casey.

"I have two Smack patches for 4.21. One Jose's patch adds
missing documentation and Zoran's fleshes out the access checks
on keyrings."