Fix consequence of SONARJAVA-51
SONARJAVA-99 Upgrade toolkit