Fix merge issues, remove excess files - match perl-5.36.0 distOK bluhm@a good time naddy@
branches: 1.1.1;Fix merge issues, remove excess files - match perl-5.24.1 dist