CLOUDSTACK-6915: Include searching deleted OS entries

(cherry picked from commit de04881da177b28d7cb3efc09adb2d8069f0fdd3)
CLOUDSTACK-6922: Updated events for firewall ingress and egress

(cherry picked from commit 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
CLOUDSTACK-5150 - set the template size from source

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 883d8f11196e9ca55324bcf075880e077a2d3df3)
Coverity issues: Fixed conflicts

Signed-off-by: Daan Hoogland <daan@onecht.net>