Merge "Fixup sulfur/jdk17 verify jobs"