Twenty-one people charged over April riot at Cessnock jail