Restores mistaken merge conflict resolution

In bam_sort.c:809-820, accidentally reverted to older version
when merging into wtsi-hgi:develop