SIPXECS-1180: improved .modules-include
SIPXECS-1180: build classpath fixes