Merge remote-tracking branch 'origin/master' into develar/is

diff --cc java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
Simple merge

diff --cc java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
Simple merge

diff --cc java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
Simple merge

diff --cc java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
index 32d906a217d0f1e764dc1ab2877071d30854a391,6545648813f3431c530fe2e70e2ca6c453f24aa2..334cfce7383571b577de6cfd009cde3cf76b86eb
--- 1/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
--- 2/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
@@@ -113,10 -108,9 +113,10 @@@ public abstract class LightDaemonAnalyz
      data.init();
  
      PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
 +    //noinspection ResultOfMethodCallIgnored
      getFile().getText(); //to load text
      myJavaFilesFilter.allowTreeAccessForFile(getVFile());
-     PsiManagerEx.getInstanceEx(getProject()).setAssertOnFileLoadingFilter(myJavaFilesFilter, myTestRootDisposable);
+     PsiManagerEx.getInstanceEx(getProject()).setAssertOnFileLoadingFilter(myJavaFilesFilter, getTestRootDisposable());
  
      try {
        Collection<HighlightInfo> infos = doHighlighting();

diff --cc platform/util/resources/misc/registry.properties
Simple merge