Fix EZP-21187: Regressions on DemoBundle
appearing with strict_variables=true
Merge pull request #12 from ezsystems/ezp_21187

Fix EZP-21187: Regressions on DemoBundle