Forward VTK to 'gerrit/master'

Also fixes issues with the new atomic reference counts.

Change-Id: I46fc884bc2df8725b82a6fa6ba7f942d0483d650
Merge topic 'forward-to-vtk-master' into next

15df6ae Forward VTK to 'gerrit/master'