MAGETWO-98345: [2.1.0] underscore in site url breaks admin redirect - The page isn't redirecting properly #5809

Author: rganin

app/code/Magento/Config/Model/Config/Backend/Baseurl.php

@@ -231,10 +231,10 @@ public function afterSave()
      * @return UrlValidator
      */
     private function getUrlValidator()
- 	{
- 	    if (!$this->urlValidator) {
- 	        $this->urlValidator = ObjectManager::getInstance()->get(UrlValidator::class);
- 	    }
+    {
+        if (!$this->urlValidator) {
+            $this->urlValidator = ObjectManager::getInstance()->get(UrlValidator::class);
+        }
         return $this->urlValidator;
     }
 }

dev/tests/integration/testsuite/Magento/Setup/Controller/UrlCheckTest.php

@@ -14,12 +14,12 @@ class UrlCheckTest extends \PHPUnit_Framework_TestCase
     /**
      * @var UrlCheck
      */
- 	private $controller;
+    private $controller;
 
- 	protected function setUp()
- 	{
+    protected function setUp()
+    {
         $this->controller = Bootstrap::getObjectManager()->create(UrlCheck::class);
- 	}
+    }
 
     /**
      * @param $requestContent