Merge pull request #2323 from JeffWDH/current
T5497: Add ability to resequence rule numbers for firewall