CONN-446: Fix for validation suite failures.
Merge pull request #487 from msweaver/CONN-446

CONN-446: Fix for validation suite failures.