Merge "JDWP: avoid crash on unsupported modifier" into lmp-mr1-dev