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