Merge 2.18.x up into 3.0.x - #2127

Merge 2.18.x up into 3.0.x#2127

greg0ire merged 22 commits into

doctrine:3.0.xdoctrine/DoctrineBundle:3.0.xfrom

greg0ire:3.0.xgreg0ire/DoctrineBundle:3.0.xCopy head branch name to clipboard