Apply patch FELIX-4493 to add support for "on demand" resource
resolving.


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