South Africa, Rwanda defuse tensions fueled by Goma crisis