Cherry-pick latest fixes for JDT deadlock from release/0.10

Change-Id: I7c55e06547c0e21be628a7771618a177b9038767
28 files changed