CLOUDSTACK-6915: Include searching deleted OS entries