converter backport in 2021-06.
In particular, add "HTML + mustache" / "MJML + mustache" instead of just "mustache".