Correct the diff hunk headers in tests on 2.0.x
Review Request #8305 — Created July 21, 2016 and submitted — Latest diff uploaded
The diff hunk headers in several test diffs were incorrect, either with
an incorrect format (@instead of@@) or with the wrong line
numbers.
Ran unit tests.