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 4bb85cd7f921d66eabe72d00dcde817affd48732)

Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java