Proposal to Consolidate City College Diversity Departments Has Riled Up Students