Fix some Contains subqueries failures with Linq#3212

gliljas wants to merge 4 commits into

nhibernate:5.4.xnhibernate/nhibernate-core:5.4.xfrom

gliljas:mappedasincontainssubquerygliljas/nhibernate-core:mappedasincontainssubqueryCopy head branch name to clipboard