FELIX-4585 fix component factory disable

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1615283 13f79535-47bb-0310-9956-ffa450edef68
FELIX-4585 fix factory component bugs revealed by enable fix

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