Merge 5.3.18 in 5.4.x#3348

fredericDelaporte merged 5 commits intonhibernate:5.4.xnhibernate/nhibernate-core:5.4.xfrom

fredericDelaporte:5.4.xfredericDelaporte/nhibernate-core:5.4.xCopy head branch name to clipboard