Fix test failures with latest AIX build.

Fix test failures with latest AIX build.

**In-progress**
that should probably be 'os' in both places.  on aix it doesn't matter, but there's many different platforms in the "solaris2" os (openindiana, nexentacore, omnios, smartos, etc) which all probably need to be excluded here.