fixup! respect Bitbucket Server urls with branch in format /refs/heads/<branchname>

Author: vinokurig

wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParser.java

@@ -228,7 +228,10 @@ private BitbucketServerUrl parse(Matcher matcher, @Nullable String revision) {
     String branchFromUrl = null;
     try {
       String branch = matcher.group("branch");
-      branchFromUrl = branch.startsWith("refs/heads/") ? branch.substring(11) : branch;
+      branchFromUrl =
+          branch.startsWith("refs/heads/")
+              ? branch.substring(11)
+              : (branch.startsWith("refs%2Fheads%2F") ? branch.substring(15) : branch);
     } catch (IllegalArgumentException e) {
       // keep branch with null, as the pattern doesn't have the branch group
     }

wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParserTest.java

@@ -78,14 +78,6 @@ public void shouldParseWithBranch() {
     assertEquals(bitbucketServerUrl.getBranch(), "branch");
   }
 
-  @Test
-  public void shouldParseWithBranch1() {
-    BitbucketServerUrl bitbucketServerUrl =
-        bitbucketURLParser.parse(
-            "https://bitbucket.2mcl.com/users/user/repos/repo/browse?at=refs/heads/branch", null);
-    assertEquals(bitbucketServerUrl.getBranch(), "branch");
-  }
-
   @Test
   public void shouldParseWithUrlBranch() {
     BitbucketServerUrl bitbucketServerUrl =
@@ -256,14 +248,21 @@ public Object[][] expectedParsing() {
         null,
         "project",
         "test1",
-        "refs%2Fheads%2Fbranch"
+        "branch"
       },
       {
         "https://bbkt.com/projects/project/repos/test1/browse?at=refs%2Fheads%2Fbranch",
         null,
         "project",
         "test1",
-        "refs%2Fheads%2Fbranch"
+        "branch"
+      },
+      {
+        "https://bitbucket.2mcl.com/users/user/repos/repo/browse?at=refs/heads/branch",
+        "user",
+        null,
+        "repo",
+        "branch"
       },
       {"https://bbkt.com/users/user/repos/repo/", "user", null, "repo", null}
     };