Move the puppetmaster private link yet again.

Move the template dir back to the default,
/etc/puppet/templates.  I don't know why it was
moved.

Change-Id: Ia186fbead0ba6fcac2ed6572c75faf7666288736