fixes #1745 - make puppetmaster hostname/domain stripping behaviour configurable
fixes #2741 - rails 3 syntax