these defaults aren't honored in puppet 3.5.1
Merge branch 'hotfix/1.1.2'