Fix for multi-granule offset bug (failures William found) [978]

This fixes all EDR cases I had the previously failed.  
Re-check of MODIS and SDRs (including DNB this time!) look good.