Fix incorrect combining of regionservers and supervisors.