cleanup (commented code)
remove unused com.intellij.psi.stubs.Stubbed
Merge remote-tracking branch 'origin/master'
test fixed
Merge remote-tracking branch 'origin/master'
refactoringIDs: IDEA-119121;IDEA-119122
refactoring listeners: missed after data (IDEA-119118)