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

OK bluhm@
a good time naddy@

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

import perl 5.10.1