SERVER-13635: make generic SortedDataInterface unit test
Merge remote-tracking branch 'upstream/master'