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)