Merge branch 'bw/solaris-sed-tr-test-portability'