Make explicit context overwrite kwargs for templating, Fix #5161
Merge pull request #5175 from basepi/context5161

Make explicit context overwrite kwargs for templating, Fix #5161