override mquery merge to append extra criteria to conditions
moved mquery.canMerge calls into new Query.merge method
added regression test to show that Model.findOneAndUpdate() appends discriminator type conditions to queries.
CS