Resolve firewall port to role mappings after role refactoring