Merge pull request #2309 from ClogenyTechnologies/kd-aix-fixes-28oct

Fix test failures with latest AIX build.