Resolve conflicts from less-643 import.

Import less-643. Way to many changes and bugfixes over the last ten
years to list. Look at src/external/bsd/less/dist/version.c for a
complete list of changes.