Fix firewall rule ID generation

All rules in a firewall were getting the same rule ID due to an
order of operations bug.
Merge pull request #38 from labisso/develop-firewall-rules

Fix firewall rule ID generation - develop