Revert "Refactor waitcondition resources to allow easier subclassing"

This reverts commit 850ac0c1b552d2bae91d5718df56c3e3a739b2f5.

One of the prior two commits prior are causing Metadata to come back empty
after signals are processed. This must be reverted because it conflicts
with those commits.

Change-Id: I37c11e3b7e4c7528ebd21736ed4a32288ff4e77e
Partial-Bug: #1337772
Merge "Revert "Refactor waitcondition resources to allow easier subclassing""