CONN-650: updates for some findbugs findings.
Merge pull request #622 from msweaver/CONN-650

CONN-650: updates for some findbugs findings.