Australia agrees to settle submarine spat with France