Merge "Fix JDWP class-only modifier."