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

Import perl-5.18.2

OK espie@ sthen@ deraadt@