Backport of JDK-8178374 to jdk8u

[Martin Buchholz]

I'll help my colleague Jonathan with this change.

Jonathan, I had trouble applying this patch because line breaks were
"helpfully" inserted e.g.

+                    total = engineUpdate(inArray, inOfs, inLen,
outArray, outOfs);

Not sure which bit of software to blame.
If you copy-paste ordinary text into a Plain text mode message, that
ought to preserve the whitespace.