fix tests
IDEA-122452 - Make fails on Error: java.lang.NullPointerException since 13.1
Merge branch 'master' of git.labs.intellij.net:idea/contrib