Fix merge issues, remove excess files - match perl-5.40.1 dist

ok sthen@
sooner rather than later deraadt@

Fix merge conflicts, remove extra files, match upstream perl-5.20.1

ok deraadt@ sthen@ espie@ miod@

Perl 5.12.2 from CPAN