(maint) backport minor fixes from master to 1.6.x#184

willmeek merged 2 commits intopuppetlabs:1.6.xpuppetlabs/puppet-resource_api:1.6.xfrom

DavidS:backportsDavidS/puppet-resource_api:backportsCopy head branch name to clipboard