This is ONLY JNB AIRPORT - no worries with Cape Town the restrictions do not apply to Cape Town.

You are in the clear for the entire trip until you hit HDS when you fly HDS to JNB. BUT I did find out that HDS has bag wrapping facilities so if you have a bag they wont allow you can get it wrapped for about $8 and be on your merry way.
LUCKY YOU!!