use html+jinja instead of html+twig
Merge pull request #3389 from xabbuh/fix-build-error

use html+jinja instead of html+twig
Merge branch '2.3' into 2.4

* 2.3:
  use html+jinja instead of html+twig
Merge branch '2.4'

* 2.4:
  use html+jinja instead of html+twig