Merge "Fix idempotence for firewall role"