resource bundle base name detection fixed (IDEA-125856)
code cleanup [^batrak]
remove redundant else branches