Thailand, Cambodia agree to new ceasefire terms