Merge branch '3449653-only-twig-visitor' into '2.0.x'

Issue #3449653 by pdureau: Execute normalization when Twig include and embed are used

See merge request !267