CONN-167: Fixed low priority findBugs issues and code cleanup
Merge pull request #407 from nareshcgi/CONN-167

CONN-167: Fixed low priority findBugs issues and code cleanup