Fix windows dashboard issues.

Change-Id: I328197ef1af61a97d1ca96bccb78c26ba8dcf868
Merge topic 'update_vtk_master' into next

8da88ee Fix windows dashboard issues.