Merge commit '54f9d7bc4655f0a783b5aeacc580b8db2b09935d' into puppet-merge

Conflicts:
	lib/runcible/extensions/yum_importer.rb