CONN-185: Fixed rest of the minor findbugs issues
Merge pull request #413 from nareshcgi/CONN-185

CONN-185: Fixed rest of the minor findbugs issues