Revert "Bug 528494 - Using the match operator for RequiredCapability"

This reverts commit 72c083ed10a1cca83f00befbefc279af09779df0.
To ensure that today's build failure is not caused by this change.

Change-Id: I3e874183b62a3f6456afa00426f9efb230639b49
12 files changed