Fixed IDEA-117789 Eclipse code style import: "Never join already wrapped lines" seems to be ignored
(cherry picked from commit 60332bb)
Fixed IDEA-114862 Formatter Control: with disabled formatter and enabled 'Use tab character' option spaces in not formatted lines are replaces with tabs in some cases
(cherry picked from commit 64bca16)
IDEA-131578 Folding 'blinks' when navigating to a method

(cherry picked from commit aee6089787926dfae0a6fd0a980b8b443d0b96d8)
IDEA-131578 Folding 'blinks' when navigating to a method - fixed existing tests

(cherry picked from commit 9a3bdff044af4a32062fd6109d4c905e650c2882)
IDEA-131578 Folding 'blinks' when navigating to a method - adjust test following review

(cherry picked from commit a46ba74dbb763aaad9ec36ddf3643f4ae983e2f2)
adding a flag to tweak folding behavior on editing

(cherry picked from commit f1f530c8a3c23453088cddb344d96fc1347dd123)
IDEA-131657 Don't expand foldings on 'Move Caret to Next/Previous Word' actions
(cherry picked from commit b4e9871)
IDEA-128650 - JBoss Deployment Structure 1.2 is missing from JBoss plugin
(cherry picked from commit 0d8f57d)
do not start unused declaration if only unused symbol is on (IDEA-114413)
ensure test data group reuses already opened editor (IDEA-131547)

(cherry picked from commit be72dd589f77abf49c7948c11a955dc73cfe25d6)
IDEA-131685 Cleanup code quick fix / Settings: focus does not go into Inspection dialog

(cherry picked from commit b2be554c6015c758b0e4b656debc9b58976cab64)
revert fd5f654/abf023de [rev=kb]
(cherry picked from commit 3d0fa6f)
CR-IC-6582 we must use ElementStateLastStorageChooserForWrite
certain case of IDEA-128919
(cherry picked from commit 75d55d4) (r=Peter.Gromov)
[git] IDEA-131705 Fix a misprint :( If there is no error, do change the target

(cherry picked from commit 679c59f)
[git] IDEA-116489 mark dirty & refresh after pull

(cherry picked from commit 583264e)
[git] IDEA-131036 notNullize environment variable values

(cherry picked from commit 66276ed)
[vcs] Update Project: wider local history action

Start the action before update, instead of before vfs refresh.
End the action after possible after-update operations (like conflicts
resolving in SVN).

(cherry picked from commit 500339d)
[git] IDEA-115997 refresh .git after creating a tag from menu action

(cherry picked from commit c2c4acd)
get file type from view provide
#WEB-13824 fixed
(cherry picked from commit b9c1f71, r=Mikhail Golubev)