Merge "JDWP: fix failures in CTS"