Cape Town International Jazz Festival to make a comeback