SERVER-10026 some QUERY_MIGRATION cleanup