Fix use of data and data_template

[aetjansen]

in a service call, data: is used when no jinja is passed, and data_template when jinja is passed along for processing. Could also use data_template everywhere at (probably) a minimal performance loss, maybe a bit more startup time.

Using data: and passing along jinja code, will not work and cause the jinja code to be taken as literal strings