6bb770
Merge branch 'jinja' into 'production' Use .jinja instead of .j2 extension See merge request infra/salt!626