Fix merge issues, remove excess files - match perl-5.24.1 dist
Import perl-5.18.2OK espie@ sthen@ deraadt@
Perl 5.12.2 from CPAN