use deleteWithRename() instead of delete(), because on some systems creating the directory right after its deletion is not possible
Merge branch '139' of git.labs.intellij.net:idea/community into 139
correct typo
correct test data, so that the test checks the make rule it was intended to verify