Merge branch 'master' into puppet-4
- master: (PUP-2388) Update Windows Jenkins matrix defs (PUP-2388) Puppet acceptance for Ruby 2 x64 (maint) Make pacman (un)install_options private (PUP-2871) Concatenate uninstall_options to argv (PUP-2871) Concatenate install install_options to argv (maint) Isolate specs from whether yaourt is installed (maint) use RSpec helpers over instance and local variables (PUP-2871) Add :install_options and :uninstall_options to the pacman provider