The Version table provides details related to the release that this issue/RFE will be addressed.
Unresolved : Release in which this issue/RFE will be addressed. Resolved: Release in which this issue/RFE has been resolved. Fixed : Release in which this issue/RFE has been fixed. The release containing this fix may be available for download as an Early Access Release or a General Availability Release.
4 tests in tests/tools/javac/proprietary failed after a merge of conflicting changsets
The fix is trivial, to update a line number in each of 4 golden files.