Merge branch 'mk/backport-fix-safe-request-store-test' into 'master'

[CE backport] Fix RequestStore-related EE-only test failure

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

spec/lib/gitlab/safe_request_store_spec.rb

@@ -219,11 +219,11 @@ describe Gitlab::SafeRequestStore do
     end
 
     context 'when RequestStore is NOT active' do
-      around do |example|
+      before do
         RequestStore.write('foo', true)
+      end
 
-        example.run
-
+      after do
         RequestStore.clear! # Clean up
       end