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

This reverts commit 07c80afa6a12b3170e1b6b1dd5b7dadc775a501e.
Revert the revert - issue is with multiple layers of features they need manual touching.

Change-Id: I3b4b8f2d64ed02d79ffd7bd9c7c5b85b45f8bd21
12 files changed