Fixes so the test suite will run
Merge branch 'pm_test_suite_fixes' of https://github.com/petems/librarian-puppet into petems-pm_test_suite_fixes

Conflicts:
	Gemfile
	features/support/env.rb