Rivalries Renewed, Djokovic Returns In Davis Cup