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

OK sthen@

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

Import perl-5.20.1