Merge branch 'vmxnet3-upgrade-to-version3'