IDEA-121140 Format spock DSL in script body
IDEA-95011 diff: better handling of FilesTooBigForDiffException in merge dialog
svn: Fixed NPE in SvnConfiguration - initialize inner state to default value
restored platform prefix autodetection to fix sql tests
Merge branch 'svn_18_3'
Merge remote-tracking branch 'origin/master'
cleanup
CR-IC-4514 @NotNull
IDEA-121193 Don't show 'Class already exists' error if there are two groovy classes with the same qualified name in different modules