Merge 2.20.x up into 3.6.x#12337

greg0ire merged 5 commits intodoctrine:3.6.xdoctrine/orm:3.6.xfrom

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