Enable and fix 'Statement unnecessarily nested within else clause' warnings

Change-Id: Ida6df4593fc2ab3c11581309b2b4a638229ea093

gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ChangeInfo.java

@@ -208,9 +208,8 @@ public class ChangeInfo extends JavaScriptObject {
             // more than one label is missing, so it's unclear which to quick
             // approve, return -1
             return -1;
-          } else {
-            ret = i;
           }
+          ret = i;
           continue;
 
         case OK: // Label already applied.

gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GitwebInfo.java

@@ -159,9 +159,8 @@ public class GitwebInfo extends JavaScriptObject {
   private String encode(String segment) {
     if (type().urlEncode()) {
       return URL.encodeQueryString(type().replacePathSeparator(segment));
-    } else {
-      return segment;
     }
+    return segment;
   }
 
   protected GitwebInfo() {