French ambassador to return to Australia after subs row