[releng] Update merge tests for the slight changes in JDT.

JDT's handling at the closing of an enum's enumerators is slightly
different now, better in that it preserves the blank line.
4 files changed