Revert "Isolate Candidates internal structure from resolver"

This reverts commit 1ee9cb28fa36423c7025585a9bd60d6b0b8ca93c.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1628629 13f79535-47bb-0310-9956-ffa450edef68
[FELIX-4659] The maven bundle plugin incorrectly reports cardinality on service references in the generated generic requirements

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1628630 13f79535-47bb-0310-9956-ffa450edef68