CLOUDSTACK-6915: Include searching deleted OS entries

(cherry picked from commit de04881da177b28d7cb3efc09adb2d8069f0fdd3)