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