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

import perl 5.16.3 from CPAN - worked on by Andrew Fresh and myself

Perl 5.12.2 from CPAN