Java to Kotlin converter: keep original placement of primary constructor body + better preserving of comments for constructor

j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt

@@ -5,6 +5,10 @@ package test
 public class Test(str: String) {
     var myStr = "String2"
 
+    {
+        myStr = str
+    }
+
     public fun sout(str: String) {
         System.out!!.println(str)
     }
@@ -21,8 +25,4 @@ public class Test(str: String) {
 
         Test(test)
     }
-
-    {
-        myStr = str
-    }
 }

j2k/tests/testData/ast/annotations/jetbrainsNullable.kt

@@ -4,6 +4,10 @@ package test
 public class Test(str: String?) {
     var myStr: String? = "String2"
 
+    {
+        myStr = str
+    }
+
     public fun sout(str: String?) {
         System.out.println(str)
     }
@@ -20,8 +24,4 @@ public class Test(str: String?) {
 
         Test(test)
     }
-
-    {
-        myStr = str
-    }
 }