FELIX-4402 remove some now dead code

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1604453 13f79535-47bb-0310-9956-ffa450edef68
FELIX-4405 Easy half of prototype scope, expose service as PrototypeServiceFactory

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