Merge remote-tracking branch 'sathieu/patch-1' into kpaulisse-file-no-parameters

Author: kpaulisse

lib/octocatalog-diff/catalog-util/fileresources.rb

@@ -122,6 +122,7 @@ def self._convert_file_resources(resources, compilation_dir, environment = 'prod
       # @return [Boolean] True of resource is convertible, false if not
       def self.resource_convertible?(resource)
         return true if resource['type'] == 'File' && \
+                       !resource['parameters'].nil? && \
                        resource['parameters'].key?('source') && \
                        !resource['parameters'].key?('content') && \
                        resource['parameters']['source'] =~ %r{^puppet:///modules/([^/]+)/(.+)}