Merge branch 'sh-fix-object-storage-qa' into 'master'

Fix QA ObjectStorage not inheriting from Test::Instance::All

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

qa/qa/scenario/test/integration/object_storage.rb

@@ -4,7 +4,7 @@ module QA
   module Scenario
     module Test
       module Integration
-        class ObjectStorage < Test::Instance
+        class ObjectStorage < Test::Instance::All
           tags :object_storage
         end
       end