Bring back signal-related tests

Reverts I90e1d26a67a349f897d895f750d8e57fae98ec1f and
I116a96b20082d1c47068ddc64873200e9ae33a27 .

There have been a few changes that should enable these tests to
succeed on a regular basis, all related to edge cases around updating
a resource's atomic_key and metadata:

Corrected max secs for concurrent trans retries
e37d9fab8fe2e779ae8c0e2311de2601b66c66b6

Don't set metadata for deleted resources
8d7e3e41e8f02726dca33b5ec2f6d5b6b6b07a31

Allow retries when resource acquires lock
2ec2d5a973927f9a2cc2a62f70712afc5cb30f4c

Change-Id: I0fe508cf102bc1041a16c5ce1d9e384ecd591173
diff --git a/functional/test_os_wait_condition.py b/functional/test_os_wait_condition.py
index 66b182b..5c1783a 100644
--- a/functional/test_os_wait_condition.py
+++ b/functional/test_os_wait_condition.py
@@ -76,7 +76,7 @@
     type: OS::Heat::WaitCondition
     depends_on: instance1
     properties:
-      count: 12
+      count: 25
       handle: {get_resource: wait_handle}
       timeout: {get_param: timeout}