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

# Conflicts:
#	platform/configuration-store-impl/src/StateStorageManagerImpl.kt

diff --cc java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
Simple merge

diff --cc platform/configuration-store-impl/src/StateStorageManagerImpl.kt
Simple merge

diff --cc platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNodeInfo.java
Simple merge

diff --cc platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
Simple merge

diff --cc platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
Simple merge

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