(maint) fix spec test failures against puppet master
A recent patch to Puppet broke several of our spec tests. This corrects the ones that are due to a changed error message. There are some other failures that are due to what seems like a Puppet bug to me. I'll wait to get confirmation before changing those ones.
Showing with 32 additions and 16 deletions