Merge remote-tracking branch 'origin/master' into kpaulisse-enc-override

Author: Kevin Paulisse

spec/octocatalog-diff/tests/catalog-util/builddir_spec.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require_relative '../spec_helper'
+
 require OctocatalogDiff::Spec.require_path('/api/v1')
-require OctocatalogDiff::Spec.require_path('/facts')
 require OctocatalogDiff::Spec.require_path('/catalog-util/builddir')
+require OctocatalogDiff::Spec.require_path('/facts')
+
 require 'socket'
 require 'yaml'