Fix for KT-6196: ClassCastException on unit property initializer

   #KT-6196 Fixed
Fix for KT-6202: Redundant and wrong linenumber after if/else condition

  #KT-6202 Fixed
Buildserver auto merge