Resolved findbugs issues in cluster module
Restored real imports instead of *