Merge branch '4.3.x'

Conflicts:
	spec/acceptance/ensure_packages_spec.rb
	spec/acceptance/ensure_resource_spec.rb

diff --cc spec/acceptance/ensure_resource_spec.rb
index c3d72fc8770f8052f26e2bf08c8402500579624e,26409fe479238daeb564cc10dbaa3fc256fe3f98..f1bfa545061cc6fcf7d9d082ca119cb4646e066d
--- 1/spec/acceptance/ensure_resource_spec.rb
--- 2/spec/acceptance/ensure_resource_spec.rb
+++ b/spec/acceptance/ensure_resource_spec.rb
@@@ -1,7 -1,8 +1,7 @@@
  #! /usr/bin/env ruby -S rspec
  require 'spec_helper_acceptance'
  
- describe 'ensure_resource function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) && fact('osfamily') != 'windows') do
 -
+ describe 'ensure_resource function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) || fact('osfamily') == 'windows') do
    describe 'success' do
      it 'ensure_resource a package' do
        apply_manifest('package { "rake": ensure => absent, provider => "gem", }')