Lisbon to welcome race for two more editions in deal running to 2018