Merge "Add support for jinja2 renderer options. (2018.2)"