r23794: convert more code from LGPLv2+ to LGPLv3+