Fix merge issues from puppet-template
Add symlinks
Finally fix the merge from puppet-template?