FORGEPLUGINS-148 Upgrade to java client 2.5.0

Corrected the RestService API usage to reflect changes done for
JBIDE-15429.

Also corrected the use of ICartridge and related classes as done
for JBIDE-13866.