Mashaba resigns as Joburg city councillor