(from AES) Merge pull request #2539 from datawire/acookin/fix-agent-chart
(from AES) Merge pull request #2539 from datawire/acookin/fix-agent-chart

fix agent chart templating
datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador