Fixing the Envisat product ingestion.
Merge branch 'master' into prod_fac_tmp