VGPU: Fixed conflicts

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>
Merge pull request #1176 from vbmithr/clearwater

Preliminary VGPU support for clearwater