Heroic officer who swapped himself for hostage during French supermarket siege dies