Fix EZP-21187: Regressions on DemoBundle

appearing with strict_variables=true