Former RSA President Zuma strikes deal with Zondo over terms of his return to state capture inquiry