SIPXECS-1178: build classpath fixes