There's no need for these files to be executable
Fix puppet lint complaints

* ' vs "
* put variables consistently in ${} when they are ""ed.
* use @s in .erb
* use undef rather than 'UNDEF'
* use $foo = $bar? { style of conditional asignment.
Resolving merge conflict after adding CentOS support.