SERVER-10026 remove most remaining QUERY_MIGRATION tags
SERVER-12826 count10.js test improvements
Merge remote-tracking branch 'upstream/master'