SERVER-10026 some QUERY_MIGRATION cleanup
SERVER-10026 errmsg isn't real
Merge remote-tracking branch 'upstream/master'