Merge branch 'maint/2.7.x/provider_parameter_description' of https://github.com/nfagerlund/puppet into 2.7.x
- 'maint/2.7.x/provider_parameter_description' of https://github.com/nfagerlund/puppet: Maint: Fix the "provider" parameter documentation
Manually Resolved Conflicts:
spec/unit/type_spec.rb