Resolved findbugs issues in cluster module