CONN-376: Regression suite for 376 (which also tests 418).
CONN-376: Fix for code review comment.
Merge pull request #489 from msweaver/CONN-376

CONN-376: Regression suite for 376 (which also tests 418).