Rspec puppet fixes

Minor updates needed to get the rspec-puppet tests on master to pass.