Be prepared to not be able to OLCI on the return flight from JNB as well. I've never been able to, and my last return a few weeks ago it was a bit tight as I was sat on the train checking my watch. Made it with 5 minutes to spare. So build in the fact you will have to go to a desk to check-in to your travel time.