Resolved findbugs issues in cluster package
Merge pull request #2082 from pveentjer/findbugs-cluster2

Resolved findbugs issues in cluster package