54c60c4628
Also remove local overrides that are now in the contrib tree. This is a direct commit to contrib/ as we will no longer import any newer groff snapshots, due to licensing issues. MFC after: 3 weeks