Merge branch 'branch-context'

# Conflicts:
#	platform/platform-api/src/com/intellij/notification/NotificationGroup.java
#	platform/platform-resources/src/META-INF/PlatformExtensions.xml

diff --cc platform/platform-resources/src/META-INF/PlatformExtensions.xml
index 4fdc23687b44644c41ba604857aeac2ff2bd0605,7e0e66cb90fa39a50545a03ebfdbecc6636f6ada..642ee3b98532a63f6648326f4ca5ce1fd2dff3a4
--- 1/platform/platform-resources/src/META-INF/PlatformExtensions.xml
--- 2/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@@ -510,7 -502,6 +510,8 @@@
      <tasks.contextProvider implementation="com.intellij.tasks.context.XDebuggerBreakpointsContextProvider"/>
      <tasks.contextProvider implementation="com.intellij.tasks.context.XDebuggerWatchesProvider"/>
  
 +    <actionPromoter implementation="com.intellij.execution.testframework.TestTreeViewActionsPromoter"/>
 +    <smartSelectProvider implementation="com.intellij.ui.tree.TreeSmartSelectProvider"/>
+     <postStartupActivity implementation="com.intellij.tasks.context.BranchContextTracker$TrackerStartupActivity"/>
    </extensions>
  </idea-plugin>

diff --cc plugins/git4idea/git4idea.iml
Simple merge

diff --cc plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
Simple merge

diff --cc plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
Simple merge

diff --cc plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt
Simple merge