Fix issue with ruminants going to zero for profit max constrained by production (rather than net prod)

fix to incorporate seed and waste losses into production passed from GAMS to Java, incl change to fbs method. Outputting demand for Frances and hacky code for Trump stuff.

Changes to have 'region' in composite country for argentina scenario and changes to trade stuff so trade parameters change over time period. Plus other tweaks.