Remove templatedir directive from puppet.conf

Debian-based packaging adds a templatedir parameter to puppet.conf
This is deprecated in puppet and hence adds a lot of deprecated warning
clutter/spam when running the integration tests.

Change-Id: Ie929328cbd7f1231f716cd468887aa579dbe2a07
Remove unnecessary non-ascii characters

This apparently causes some issues on some environment:
http://lists.ceph.com/pipermail/ceph-users-ceph.com/2014-November/044742.html

Change-Id: If86b440ea73888ebc886410d947fd430a245cb7a