CONN-53 subtask CONN-145: fixes for issues found while integration testing.
Merge pull request #6 from msweaver/master

Fixes for issues found while QAing/integrating CONN-148.