GROOVY-6870: Sortable should honor typical Java generics usage (fix patch glitch)