JBIDE-16421 - Fixing sonar issues in WS (non RS) code