master
Ticket 4633: code cleanup before 4.8.34 release.
Update copyright years.
formatting: step 6 - manual tweaks