TRINIDAD-2464
maintain selection order

Thanks to jing wu.

applied patch selectionOrderJIRA2436.patch
3 files changed