FELIX-4050: Avoid messing up component state calculation when an init method adds
available dependencies using the API and also returns a Map for configuring
other named annotated dependencies.


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