More OS/2 changes.  Batches 19 & 20 of Bug #34106 r=pavlov
More OS/2 changes.  Batches 19 & 20 of Bug #34106 r=pavlov

ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss