Merge branch 'master' into amakeev/gradle

# Conflicts:
#	community/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java

GitOrigin-RevId: d931e798108685731bf185f7c2e3221680b8e5a2

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/expressions/OuterCallOverloads.java

@@ -0,0 +1,14 @@
+import java.util.List;
+import java.util.Set;
+
+abstract class Overloadsss {
+  abstract <T> List<T> foo(List<T> l);
+  abstract <T> Set<T>  foo(Set<T> s);
+
+  abstract <K> List<K> bar1(List<K> l);
+  abstract <K> Set<K>  bar1(Set<K> s);
+
+  {
+    List<String> l1 = foo(<caret>bar1(null));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/UnqualifiedStaticInterfaceMethodCallsOnInnerClasses.java

@@ -12,4 +12,17 @@ interface Test {
 
   static void of(String... lists) { }
 
+}
+
+interface Entry<T> { }
+interface ClassA<T> {
+  static <T> void f(Iterable<T> values) {
+  }
+}
+interface ClassB<T> extends ClassA<Entry<T>> {
+  static <T> void f(Iterable<? extends Entry<? extends T>> values) {}
+  
+  static void m(Iterable<Entry<String>> x) {
+    f(x);
+  }
 }