Minor code corrections after code review
Fixed KT-5396 J2K: properly format "else if" on conversion
 #KT-5396 Fixed
Java to Kotlin converter: minor refactoring of switch conversion + no need for empty else
Java to Kotlin converter: refactoring and fixing switch conversion

 #KT-5390 Fixed