SERVER-12213 all indices are btree based indices
Merge remote-tracking branch 'upstream/master'