fix and merge SAFE reader for MERIS and OLCI, fix renav of a renaved Hawkeye file, updated gmao_cf_sbset
