France’s Hollande steps in to calm row with Morocco