Popular Oranjezicht Market to relocate and share in V&A Waterfront’s R20bn upgrade