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

looking good sthen@, Great! bluhm@

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

Update Test::Simple to 0.98

ok millert@