SERVER-14174 enforce ntoreturn during plan ranking
Merge remote-tracking branch 'upstream/v2.6' into v2.6