Update jdt.core and tests to 5138a70372af4817aefdd3da44dfadf7f7557bf3
+ plus some merge-related fixes
85 files changed