Merge 2.20.x up into 3.5.x#12143

greg0ire merged 10 commits intodoctrine:3.5.xdoctrine/orm:3.5.xfrom

greg0ire:3.5.xgreg0ire/doctrine-orm:3.5.xCopy head branch name to clipboard