Fix for rspec-puppet 1, lint fixes