This year sees pilgrims from Shiite Iran return to Mecca in Saudi Arabia after a hiatus following a diplomatic spat between the regional rivals and a deadly stampede in 2015.