Merge branch 'MAGETWO-52486' into MAGETWO-53988

Author: mlogvin

lib/internal/Magento/Framework/Url.php

@@ -232,7 +232,7 @@ protected function _parseUrl($url)
             'user' => 'setUser',
             'pass' => 'setPassword',
             'path' => 'setPath',
-            'query' => 'setQuery',
+            'query' => '_setQuery',
             'fragment' => 'setFragment',
         ];