IDEA-130779 Exception when pushing Mercurial repository in a mixed project
(cherry picked from commit e6b9a4e)
Appropriate borders, gaps and icons modified for different LaF to avoid ui shifts and movements between loading, edit_mode and normal state.
(cherry picked from commit 178a73c)
Fix vertical gaps for big fonts  in push dialog tree renderer.
(cherry picked from commit 6902fe4)
rootsToRefresh should be keyed with localPath, not root path
php plugin version 138.2502 was marked as incompatible
(cherry picked from commit b93c5fb)
IDEA-95126 Arrangement: Provide ability to negate conditions
(cherry picked from commit c02bf65)
IDEA-95126 Arrangement: Provide ability to negate conditions: deselect condition on second click
(cherry picked from commit efc22a3)
IDEA-95117 Arrangement  Allow to specify 'condition' sequences
(cherry picked from commit fceb2d5)
IDEA-95117 Arrangement: Allow to specify 'condition sequences': clean up
(cherry picked from commit c795e13)
IDEA-95117 Arrangement: Allow to specify 'condition sequences': add new icon
(cherry picked from commit 5ad1317)
IDEA-95117 Arrangement: Allow to specify 'condition sequences': create custom token for rule aliases
(cherry picked from commit 7f780ce)
IDEA-95117 Arrangement: Allow to specify 'condition sequences': support in java
(cherry picked from commit 437bd55)
IDEA-95126 Arrangement: Provide ability to negate conditions: create default tokens as invertible
(cherry picked from commit 6dacf8c)
compilation fix: IDEA-95126
(cherry picked from commit 0e7b172)
[vcs-log] details panel show everything in one single scrollable pane IDEA-131292

(cherry-picked from f7c31b7)
[vcs-log] white background in details panel IDEA-131292

(cherry picked from commit 441f80453699256b41958c5fa66b50ef59408ee5)
EA-60992  / IDEA-131551 - UOE: TestDataGroupVirtualFile.contentsToByteArray
(cherry picked from commit 0582a74) CR-IC-6490
TestDataGroupVirtualFile: delegate to beforeFile
to avoid "File was modified" notification
(cherry picked from commit 4c0cd33) IDEA-131551, CR-IC-6490
IDEA-131568 Wrong fold region is unfolded on mouse click

(cherry picked from commit 7fdfed0e1a557ae41ff92a9e150927a92688c94f)
make doOkAction  public in IdeSettingsDialog
(cherry picked from commit 492d3b6)