Apply patch FELIX-4498 to improve handling of optional requirements.


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