Ending weeks of diplomatic protest over Canberra's decision to scrap a contract to buy French submarines, France announces return of its ambassador to Australia.