CONN-520: updates to fix DS regression tests.
Merge pull request #516 from msweaver/CONN-520

CONN-520: updates to fix DS regression tests.