Merge "JDWP: fix breakpoint on catch statement"