Merge "Add JDWP failures found by buildbot"