Removing trailing spaces is a change that we should apply separately.  Not a big deal here, but may be worth including this in the list of cleanups before 1.3 branching.