JBIDE-15118 - Fixing issue with RS & WS wizard validation