SERVER-12627 do not apply id hack to query containing hint
Merge remote-tracking branch 'upstream/master'