Fix singular/plural variable collision in baked templates#1075

dereuromark merged 3 commits into3.xcakephp/bake:3.xfrom

fix-singular-plural-var-collisioncakephp/bake:fix-singular-plural-var-collisionCopy head branch name to clipboard