branches: 1.8.32; 1.8.56;
Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22268, verified by myself.