This patch removes the jinja2 delimiters from the when clause and cleans up the name of the configuration file deployment task. Closes-Bug: 1735782 Change-Id: I7e1ead5d3dfc9d36b182c73631801cefefb2fbad