diff --git a/.sync.yml b/.sync.yml
@@ -6,9 +6,6 @@ Rakefile:
 spec/spec_helper.rb:
   unmanaged: true
 appveyor.yml:
-  matrix_extras:
-    - PUPPET_GEM_VERSION: 4.2.3
-      RUBY_VER: 21-x64
   test_script:
     - 'bundle exec rspec spec/unit spec/integration -fd -b'
 MAINTAINERS.md:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,15 @@
-## 2016-11-17 - Supported Release 2.1.1
+## 2017-07-27 - Supported Release 2.1.2
+
+### Summary
+
+Small release with bugs fixes.
+
+### Bug Fixes
+
+- Fix Global Warning variable ([MODULES-5224](https://tickets.puppetlabs.com/browse/MODULES-5224))
+- Move PowerShell template file to stop conflicts with DSC Module ([MODULES-5228](https://tickets.puppetlabs.com/browse/MODULES-5228))
+
+## 2017-07-07 - Supported Release 2.1.1
 
 ### Summary
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -14,18 +14,28 @@ environment:
     RUBY_VER: 21
   - PUPPET_GEM_VERSION: ~> 4.0
     RUBY_VER: 21-x64
-  - PUPPET_GEM_VERSION: ~> 4.0
-    RUBY_VER: 23
-  - PUPPET_GEM_VERSION: ~> 4.0
-    RUBY_VER: 23-x64
-  - PUPPET_GEM_VERSION: 4.2.3
-    RUBY_VER: 21-x64
-  - PUPPET_GEM_VERSION: 4.2.3
+  - PUPPET_GEM_VERSION: ~> 5.0
+    RUBY_VER: 24
+  - PUPPET_GEM_VERSION: ~> 5.0
+    RUBY_VER: 24-x64
+  - PUPPET_GEM_VERSION: 4.7.1
     RUBY_VER: 21-x64
 matrix:
   fast_finish: true
 install:
 - SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH%
+- ps: |
+    # AppVeyor appears to have OpenSSL headers available already
+    # which msys2 would normally install with:
+    # pacman -S mingw-w64-x86_64-openssl --noconfirm
+    #
+    if ( $(ruby --version) -match "^ruby\s+2\.4" ) {
+      Write-Output "Building OpenSSL gem ~> 2.0.4 to fix Ruby 2.4 / AppVeyor issue"
+      gem install openssl --version '~> 2.0.4' --no-ri --no-rdoc
+    }
+
+    gem list openssl
+    ruby -ropenssl -e 'puts \"OpenSSL Version - #{OpenSSL::OPENSSL_VERSION}\"; puts \"OpenSSL Library Version - #{OpenSSL::OPENSSL_LIBRARY_VERSION}\"'
 - bundle install --jobs 4 --retry 2 --without system_tests
 - type Gemfile.lock
 build: off

diff --git a/lib/puppet/provider/exec/powershell.rb b/lib/puppet/provider/exec/powershell.rb
@@ -31,7 +31,7 @@
         }
   EOT
 
-  POWERSHELL_UPGRADE_MSG = <<-UPGRADE
+  POWERSHELL_MODULE_UPGRADE_MSG = <<-UPGRADE
   Currently, the PowerShell module has reduced v1 functionality on this agent
   due to one or more of the following conditions:
 
@@ -55,7 +55,7 @@
   UPGRADE
 
   def self.upgrade_message
-    Puppet.warning POWERSHELL_UPGRADE_MSG if !@upgrade_warning_issued
+    Puppet.warning POWERSHELL_MODULE_UPGRADE_MSG if !@upgrade_warning_issued
     @upgrade_warning_issued = true
   end
 

diff --git a/lib/puppet_x/puppetlabs/powershell/powershell_manager.rb b/lib/puppet_x/puppetlabs/powershell/powershell_manager.rb
@@ -126,7 +126,7 @@ def exit
 
       def self.init_path
         # a PowerShell -File compatible path to bootstrap the instance
-        path = File.expand_path('../../../templates', __FILE__)
+        path = File.expand_path('../../../templates/powershell', __FILE__)
         path = File.join(path, 'init_ps.ps1').gsub('/', '\\')
         "\"#{path}\""
       end

diff --git a/lib/puppet_x/templates/init_ps.ps1 → ...puppet_x/templates/powershell/init_ps.ps1 b/lib/puppet_x/templates/init_ps.ps1 → ...puppet_x/templates/powershell/init_ps.ps1
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-powershell",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "author": "Puppet Inc",
   "summary": "Adds a new exec provider for executing PowerShell commands.",
   "license": "Apache-2.0",