Fix merge issues, remove excess files - match perl-5.24.2 distOK bluhm@, Reads ok sthen@
branches: 1.1.1;Apply local patches - perl-5.24.1