France and Russia resolve Mistral warship dispute