[vcs] Fix branch names in the branch popup in case of merge conflict

Remove RootAction#getBranch and use the same getDisplayableBranchText
which is used for the lower bar of the popup.
[vcs] IDEA-110503 Fix already disposed