Merge "Improve change-markers and diffs in some of j.u.concurrent."