CONN-53 subtask CONN-145: fixes for issues found while integration testing.