Findbugs finding : Incorrect use of equality

(cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6)
Backport fixed for issues found by Findbugs
Backport findbugs configuration to 4.3 so we can run a findbugs report in jenkins.