Puppet templates are 'content'

I hate puppet

Change-Id: Iafe2fbbe54d5621e4073e6e077f44d9bef887eba
Merge "Puppet templates are 'content'" into production