Bug fix for separateAllByClass, moving CB22.1x to before CB22x and
fixing a typo so that the log entries for that class will be correctly
separated out.