Merge branch 'master' into changeSignature

java/java-tests/testData/psi/formatter/java/AlignMultiLine_after.java

@@ -3,6 +3,6 @@ class Foo {
     public void foo() {
         int someVariable = (y +
                             z
-                           );
+        );
     }
 }

java/java-tests/testData/psi/formatter/java/IfElse_after.java

@@ -14,7 +14,7 @@ public class Foo {
                     if (x < 0) {
                         int someVariable = (y +
                                             z
-                                           );
+                        );
                         someVariable = x =
                                 x +
                                 y;