CLOUDIFY-1793 - Checkstyle cleanup.