Merge branch '341-fix-invocations' into 'vulkan-cts-1.0'