[Backport 2.x] Prevent unnecessary heap sort when buckets needs to be ordered by key…

[Backport 2.x] Prevent unnecessary heap sort when buckets needs to be ordered by key… #2598