PRD-4434: Incomplete port of fix from 3.9
Merge pull request #25 from tmorgner/master

PRD-4434:  fix for unit test failure