Unify portrange-support in firewall rule generator fixes #4404