Merge branch 'CLDC-4140-remove-old-gender-question-lettings' into CLDC-4203-update-bulk-upload-field-numbers

# Conflicts:
#	app/helpers/bulk_upload/lettings_log_to_csv.rb
#	app/services/bulk_upload/lettings/year2026/row_parser.rb
#	spec/services/bulk_upload/lettings/year2026/row_parser_spec.rb

spec/services/bulk_upload/lettings/year2026/row_parser_spec.rb

@@ -2087,9 +2087,9 @@ RSpec.describe BulkUpload::Lettings::Year2026::RowParser do
 
         it "does not add errors to fields that are not routed to" do
           parser.valid?
-          expect(parser.errors.where(:field_156, category: :soft_validation)).not_to be_present
+          expect(parser.errors.where(:field_62, category: :soft_validation)).not_to be_present
           expect(parser.errors.where(:field_63, category: :soft_validation)).not_to be_present
-          expect(parser.errors.where(:field_160, category: :soft_validation)).not_to be_present
+          expect(parser.errors.where(:field_68, category: :soft_validation)).not_to be_present
           expect(parser.errors.where(:field_69, category: :soft_validation)).not_to be_present
         end
       end