JBIDE-17793 - servertools n&n

JBIDE-17793 - servertools n&n