Module sync 1d81b6a (#267)

.travis.yml

@@ -22,7 +22,7 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.4.0
+  - rvm: 2.4.1
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 5.0"
   - rvm: 2.1.9

spec/spec_helper.rb

@@ -4,5 +4,6 @@ require 'puppetlabs_spec_helper/module_spec_helper'
 # put local configuration and setup into spec_helper_local
 begin
   require 'spec_helper_local'
-rescue LoadError
+rescue LoadError => loaderror
+  puts "Could not require spec_helper_local: #{loaderror.message}"
 end