Merge remote-tracking branch 'owls/MAGETWO-95232-safari-prototype-bug' into BugFixPR

Author: Joan He

app/code/Magento/Theme/view/base/requirejs-config.js

@@ -64,3 +64,9 @@ var config = {
         }
     }
 };
+
+require(['jquery'], function ($) {
+    'use strict';
+
+    $.noConflict();
+});

lib/web/jquery/patches/jquery.js

@@ -22,14 +22,12 @@ define([], function () {
     return function ($) {
         var majorVersion = $.fn.jquery.split('.')[0];
 
-        $.noConflict();
-
         if (majorVersion >= 3) {
             console.warn('jQuery patch for CVE-2015-9251 is no longer necessary, and should be removed');
         }
 
-        ajaxResponsePatch(jQuery);
+        ajaxResponsePatch($);
 
-        return jQuery;
+        return $;
     };
 });