Merge pull request #5551 from gilles-peskine-arm/jinja-markupsafe-2.1-dependency

Require an older version of markupsafe for the sake of older Jinja2