fix deprecation warnings in ERB templates when using puppet 3.x
Merge remote-tracking branch 'remotes/mfournier/fix-erb-warnings'
Fix using 'source' or 'finish_source' in service definitions.

Source conflicted with content which was always defined, which resulted
in a 'You cannot specify more than one of content, source, target'
puppet exception.