Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20180823.1' into staging