Set Jinja2's keep_trailing_newline=True in template_from_string.

Without this setting, the newline idempotence of scalar strings changes depending on whether
or not they contain any Jinja2 template blocks.
Merge branch 'devel' of https://github.com/leverich/ansible into leverich-devel
Merge branch 'leverich-devel' into devel