[FELIX-4354] ResolverHookTests OSGi CT failures

These CT failures are now fixed. All of the code changed in this commit is covered by CT tests.


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