client find-bugs resolved
Merge pull request #1722 from gurbuzali/client-findbugs/3.x-master

client find-bugs resolved