Move UCB-licensed code from 4-clause to 3-clause licence.

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

Whitespace nits.

convert to new RCS id conventions.

Merge 4.4-Lite version.

Import original 4.4-Lite version.