Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5

This commit is contained in:
James Morris 2017-10-19 12:28:38 +11:00
commit 494b9ae7ab
23 changed files with 168 additions and 80 deletions