firewall: T3900: fix migration and smoketests

[c-po]

Change Summary

Commit 770edf0 ("T3900: T6394: extend functionalities in firewall") changed the position in the CLI for conntrack timeout. This lead to failing smoketests because of a regression in the migrator.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Code style update (formatting, renaming)
• Refactoring (no functional changes)
• Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
• Other (please describe):

Related Task(s)

• https://vyos.dev/T3900

Related PR(s)

• T3900: Add support for raw tables in firewall #3578

Component(s) name

Proposed changes

How to test

Smoketest result

Checklist:

• I have read the CONTRIBUTING document
• I have linked this PR to one or more Phabricator Task(s)
• I have run the components SMOKETESTS if applicable
• My commit headlines contain a valid Task id
• My change requires a change to the documentation
• I have updated the documentation accordingly

[github-actions]

👍
No issues in PR Title / Commit Title

[sever-sever]

@Mergifyio backport circinus-stream

[mergify]

backport circinus-stream

✅ Backports have been created

• #3634 firewall: T3900: fix migration and smoketests (backport #3632) has been created for branch circinus-stream