Merge branch 'unify-uploaders-objects_storage.rb' into 'master'

Unify from EE for app/uploaders/object_storage.rb

See merge request gitlab-org/gitlab-ce!19660

app/uploaders/object_storage.rb

@@ -22,10 +22,10 @@ module ObjectStorage
     module RecordsUploads
       extend ActiveSupport::Concern
 
-      def prepended(base)
+      prepended do |base|
         raise "#{base} must include ObjectStorage::Concern to use extensions." unless base < Concern
 
-        base.include(RecordsUploads::Concern)
+        base.include(::RecordsUploads::Concern)
       end
 
       def retrieve_from_store!(identifier)