Altium import

- Handle intermediate Altium version with some fields but not others
- Ensure that we are properly moving text that is not a box and not a
  field

(cherry picked from commit 9aba808366)

pcbnew/pcb_io/altium/altium_parser_pcb.cpp

@@ -932,7 +932,10 @@ AVIA6::AVIA6( ALTIUM_BINARY_PARSER& aReader )
         {
             diameter_by_layer[ii] = aReader.ReadKicadUnit();
         }
+    }
 
+    if( subrecord1 > 209 )
+    {
         aReader.Skip( 38 );
         soldermask_expansion_linked = aReader.Read<uint8_t>() & 0x01;
         soldermask_expansion_back = aReader.ReadKicadUnit();

pcbnew/pcb_io/altium/altium_pcb.cpp

@@ -4130,7 +4130,7 @@ void ALTIUM_PCB::ConvertTexts6ToFootprintItemOnLayer( FOOTPRINT* aFootprint, con
     }
     else
     {
-        field->SetPosition( aElem.position );
+        text->SetTextPos( aElem.position );
     }
 
     ConvertTexts6ToEdaTextSettings( aElem, text );