Marseille Oil Terminal Strike Ends