Between heat and war, Saudi Arabia seeks incident-free Hajj