CONN-601: fix and regression test updates.
Merge pull request #598 from msweaver/CONN-601

CONN-601: fix and regression test updates.