branches: 1.5.32;
Move Mark Nudelman's code from a 4-clause to a 3-clause licence by removing
the advertising clause. Diffs provided in PR 22549 by Joel Baker, confirmed
to the board by Mark Nudelman.