Fix conflict: JTAG VPI changes vs openocd refactor