SERVER-12277 additional validation on text queries
Merge remote-tracking branch 'upstream/master'