CLOUDSTACK-5619: Egress Firewall rules - Increased timeout for router to come up
CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
(cherry picked from commit fa43987e43162c6f87ca8e341afe55e4f45ef058)